merged!
heheh

Merge branch 'master' of github.com:lazygyu/cyphers_defense_js

Conflicts:
	index.html