Kenneth Jao d3676ec3ab Merge branch 'master' of https://github.com/ksjdragon/hourglass ...

Conflicts:
	client/profile/profile.js

2016-09-27 00:24:43 -04:00

..

constants.js

Added themes in constants, and background images, minor fixes

2016-09-27 00:22:26 -04:00

router.js

fix bug of avatar pic not showing on non-admin

2016-09-26 19:05:06 -04:00