conflicts
Merge branch 'master' of git://github.com/elpassion/elranks

Conflicts:
	app/views/welcome/index.html.slim