haml + root
Merge branch 'master' of github.com:netguru/whoiswho

Conflicts:
	Gemfile