First commit with lots of goodies
Merge branch 'master' of github.com:benjaminmgross/team1_project2