fixed bugs
Merge branch 'master' of https://github.com/29jm/Chloggr

Conflicts:
	index.html