This is just a test
Merge branch 'master' of https://github.com/rosspcahoon/slogo

Conflicts:
	src/Main.java
Status and Parser update
forgot to save before pushing

whoops
added status update to Controller, parser functionality into model
updated room and pentrail
nothing...
test...
another test...
Renderable Set up
Merge branch 'master' of https://github.com/rosspcahoon/slogo.git
changed paintable to renderable
Merge branch 'view' of https://github.com/rosspcahoon/slogo

Conflicts:
	src/controller/Controller.java
	src/model/Renderable.java