930 am
Merge branch 'homePage'

Conflicts:
	app/views/layouts/application.html.erb
Trial page
Minor changes in trial page
Moved foundation icons to staticPages.scss
Changing static
For heroku