A lot of refactoring
Merge branch 'master' of https://github.com/Wisebadge/Wisebadge.github.io

Conflicts:
	myproject/www/index.html