Merge pull request #110 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design
about page TODO: image
Update README.md
refactored the application controller
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into refactor
pulled out nonesense from the stylesheet
test for about page success
tests for about page
Merge pull request #112 from fiery-skippers-2014/refactor

Refactor
merging
Merge pull request #113 from fiery-skippers-2014/about_page

About page
added site info on welcome page