Working on more stylez.
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile
Precompiles assets for Heroku.
Tries changing it it compile in production.
Sets up initial styling.