setting things up

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

Conflicts:
	.gitignore
Merge pull request #1 from petermeissner/going-for-version-0.1

version 0.1