SFAFA
Merge pull request #8 from addisonbgross/abg

SFAFA
Merge branch 'master' into max

Conflicts:
	src/Dreamer/Level.java
Merge branch 'max'