Replacing ERB with HAML (application layout)
Merge branch 'master' into haml

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #6 from rhokbrisbane/haml

Replacing ERB with HAML (application layout)