Changed application

Conflicts:
	app/views/layouts/_header.html.haml
Updated README