- Updated exercise code base
Merge branch 'master' of https://github.com/cs27x/team8

Conflicts:
	src/main/java/org/cs278/whammy/App.java