Kenneth Jao c2d06c9036 Fix merge conflict

2016-09-05 00:16:26 -04:00

..

main.css

CSS optimization, changed client profile handling

2016-09-05 00:08:59 -04:00

main.html

CSS optimization, changed client profile handling

2016-09-05 00:08:59 -04:00

main.js

Fix merge conflict

2016-09-05 00:16:26 -04:00