Add a staticpages controller
added static home page and test home page
Merge branch 'master' into static-pages

Conflicts:
	app/views/static_pages/home.html.erb
Finish static pages