Nothing
Merge branch 'master' of https://github.com/dillonburton/BadBoyz

Conflicts:
	JS site/index.html

Solved this conflict