cleaning up code
updating codebase
resolving conflicts
setup changes
;
Merge branch 'gh-pages' of https://github.com/mollases/docr into gh-pages

Conflicts:
	app/styles/main.scss