stupid shit
Merge branch 'master' of https://github.com/TeamSimplicity/ACard

Conflicts:
	www/index.html