removed crap
Merge branch 'master' into Colin-Dev
added View and Controller for launcher
Merge branch 'Colin-Dev'

Conflicts:
	src/Block.java