Apply both changes
Merge branch 'ant_control' of ssh://github.com/charles-clauss/project1_fall2014_cs351 into ant_control