Fixed gemfile
Added static-pages controller
Finished static pages
Merge branch 'static-pages'

Conflicts:
	Gemfile