Festival functionalty works except that it doesnt return the cards to discard
merging with master
festival mini game bug fixing
fucking bug fixes
mergeing with master
done with fixing festival model bugs - just have the view to finish
Merge branch 'controller'
Merge branch 'controller'
merging with the master
Merge branch 'master' into controller