adjustments to custom.css, app.html & index working to adjust styling
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree into Upstream-master
fix merge conflicts in site/index, custom.css & app.html.erb working to fix origin deverge issue
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree