Cleaning up model loading
Merge branch 'master' of https://github.com/addisonbgross/Dreamer

Conflicts:
	src/Dreamer/Level.java
Merge branch 'master' of https://github.com/addisonbgross/Dreamer