header
Merge branch 'master' of https://github.com/danishmughal/wikiflow

Conflicts:
	app/assets/stylesheets/z-edits.css.scss
	app/views/main/view-diagram.html.erb
header