small style tweaks in app.html
Merge https://github.com/Patrickmnts/FlowFree into Upstream-master
remove simple_form from app.html.erb
Merge branch 'Upstream-master'