made some fun changes
Merge remote-tracking branch 'origin'

Conflicts:
	public/index.html
	public/js/main.js