getting app ready to roll
Merge branch 'master' of https://github.com/caridy/feecbr-app