working on Goal card stuff.
Merge branch 'master' of
https://github.com/conorthbrennan/Flapples_MVP.git

Conflicts:
	src/Deck.java
	src/Game.java
	src/Goal.java
Merge branch 'master' of
https://github.com/conorthbrennan/Flapples_MVP.git

Conflicts:
	src/Game.java