party
committing
Merge branch 'master' of github.com:uncreative-commons/candies

Conflicts:
	public/javascript/main.js
Merge branch 'master' of github.com:uncreative-commons/candies