non important stuff
Merge branch 'master' of https://github.com/0xenvision/negotiator-inator

Conflicts:
	src/app/views/kinks/index.jade