Completed crashed garbage.
Merge branch 'master' of github.com:rodnover55/ludum_dare

Conflicts:
	mans.js
Merge branch 'master' of github.com:rodnover55/ludum_dare