Merge branch 'master' of heroku.com:gentle-citadel-2264
Merge branch 'master' of github.com:Ascariel/Sample-App-Foundation-Updated