blah
Conflict resolved

Conflicts:
	src/com/onesixty/seven/platform/commandline/Model.java