Adhere to code standard for braces/indentation

Need to add comments as classes are implemented.
Update client pack
Merge branch 'ant_control'

Conflicts:
	src/clientPack/antworld/data/AntData.java

Update client pack
Merge branch 'master' of ssh://github.com/charles-clauss/project1_fall2014_cs351