first commit
Merge branch 'master' of github.com:bstaint/archnote

Conflicts:
	README.md