Commit Hour 2
Merge branch 'master' of https://github.com/bcraig108/JavaClass_2013_Summer