first
.gn
+nav bp
before merge
Merge branch 'ver1' of https://github.com/rmjames/rjames

Conflicts:
	npm-debug.log