:lipstick:
Merge branch 'master' of https://github.com/netguru/whoiswho

Conflicts:
	app/views/main/show_random_folk.html.haml