added thin
Merge branch 'master' of heroku.com:sampleapp24
tweaks
conflict resolved
minor change
bootstrap tracked
minor tweak
conflicts resolved
assets compile