123
Merge branch 'master' of https://github.com/KernelCorp/converzilla
123
Merge remote-tracking branch 'origin/master'

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