made some view/controller methods in spec/adamtest
Adding controller things
Merge branch 'master' of https://github.com/amelialaundy/the_thirsty_games into adam
Merge pull request #4 from amelialaundy/adam

Adam