Added StaticPages Controller
Merge branch 'heroku' of https://github.com/idevelopcookies/sample_app into static-page

Conflicts:
	public/index.html
Merge branch 'heroku' of https://github.com/idevelopcookies/sample_app into static-page

Conflicts:
	public/index.html