Debugging
Fix merge conflict
Fixed problem with deck not being persistant
Merge branch 'dev' of github.com:the-hobbes/softwareEngineeringProject1 into dev