Work
Merge branch 'master' of github.com:bamorim/horsecode

Conflicts:
	www/js/index.js