start
Merge branch 'master' into going-for-version-0.1

Conflicts:
	.gitignore