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

..

login

fix version

2016-09-25 12:00:23 -04:00

main

Added themes in constants, and background images, minor fixes

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

profile

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

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