adjusting ant build
Merge branch 'master' of https://github.com/cameronmccord2/cs340
final touches
added Dan's stuff
added all last min changes