devise
resolve conflict
Merge branch 'master' of https://github.com/MitulP91/andrew-madden-game into m-development
added user model testing