Apply both changes
Merge branch 'ant_control' of ssh://github.com/charles-clauss/project1_fall2014_cs351 into ant_control
Add functions to ant controller
First version to test on server
Modify event update
Merge branch 'ant_control'

Conflicts:
	src/controller/Ant.java

Modify event updating