Page updating (second day)
Merge branch 'dev'
Merge branch 'master' of github.com:magmarails/magmarails-com

Conflicts:
	app/views/home/index.html.haml
Images fixed
Merge branch 'dev'