moved app up to root (because heroku was complaining...)
Merge branch 'master' of github.com:chriswait91/smartHack