cleaned up code, may need to make some more changes before tomorrow afternoon
Merge branch 'master' of https://github.com/fdac/team2
Changes have been made since I last worked on this.