- haml gems added
Merge branch 'pdf'

Conflicts:
	Gemfile~