First Changes
Merge branch 'master' of github.com:camicano/monsters_app