New style changes
Merge branch 'front' of https://github.com/Dawenster/inflationatr into front

Conflicts:
	app/views/pages/landing.html.erb
Fix #3
merge git conflict
Merge pull request #2 from Dawenster/front

Front