updated .gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore
finished unit tests
Merge branch 'release/0.1.0'