Adding static pages
Merge branch 'master' into add_user_styling
Removed scaffolds stylesheet that was messing up views