initial commit
fixed a merge conflict
Merge branch 'master' of github.com:parisliahyun/hunger
did some upsted to the model added tests for a tribute and a gamemaker
Merge pull request #1 from parisliahyun/testing

Testing