Update to test fixtures
Merge branch 'master' of https://github.com/asubowo/Spritz2114

Conflicts:
	src/cs2114/spritz/SpritzScreenTests.java
Update to test fixtures