stars
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/main.js
levels more working
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/config.json
	public/javascripts/main.js
hell
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/config.json
fixed enemy count
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/main.js
Splash text stuff
stars that work - better than jam
no changes
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/main.js
nocrash
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh
Input disabled during splash
zdfg
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh
Splash updated
adffsdgvs