More improvements on the file reader
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014
Some improvements to the level reader, should read some of the basics
now
Merge branch 'master' of https://github.com/Whirligig231/boilermake2014

Conflicts:
	src/Level.java