ruby 2.1.1
Merge branch 'master' into deploy
rails12_factor for production
remove PORT from Procfile puma run command
nope that was a bad idea
gemfile readjust
placeholder change for dokku restart
switch to font awesome (for now) since its late and I cant get FlaUI fonts to work on production
minor change to activity show page