Wrote Controller
Recording Controller rather than position on screen, abstracted out
Controller interface from the classes themselves
Merge remote-tracking branch 'origin/controller'

Conflicts:
	SomeGame/bin/.gitignore
	SomeGame/src/net/Merc.java