loading and displaying cute critters
Merge branch 'master' of github.com:Rialgar/GGJ2014

Conflicts:
	js/main.js
formatting main.js