Add unicorn
Merge commit 'b2b2b14c20e7689532380eaf6776b9f7e2493446'

Conflicts:
	app/controllers/home_controller.rb
Styling