markers
Merge branch 'master' of https://github.com/uncreative-commons/candies

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