State refresh
Merge branch 'master' of https://github.com/mfadoul/swe681-gameproject
Controller fixes and discard of played action card
Refactor of gameProject and Actions to deal with Merge better