v1 wookmarl
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev

Conflicts:
	app/assets/stylesheets/snippy.scss