Initial commit
initial skeleton
Merge remote-tracking branch 'nash/master'

Conflicts:
	README.md