merging
got make command to work?
merging purpose
Merge branch 'modelcontroller' of https://github.com/thnbgr/SLogo into modelcontroller
lol
something wrong with the make?
make parser works
stuff for controller
turtle commands work
syntax testing
fixed
come back command properties
if commands work!
I've tried my best to merge the files together, but there are still a bunch of X's in the parser packages. Not sure what to make of this
parser is now ready for all control structure commands
spacing changes
spliting working
Merge remote-tracking branch 'origin/master' into modelcontroller

Conflicts:
	src/controller/Controller.java
	src/model/Model.java
	src/parser/Parser.java
merging
Merge remote-tracking branch 'origin/merge' into modelcontroller

Conflicts:
	src/command/CommandPreParser.java