Converted a few files to HAML for reference
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile