Added Colin and Jordan's commits PLEASE MERGE BEFORE EDITING!!!!
O
Merge branch 'master' of github.com:Donnervoegel/java
Merge pull request #257 from firethanatos/master

This should work