initial commit
Merge commit 'c865cdc7bd99809f85593181947b0f565e3aa7be'

Conflicts:
	.gitignore
bug fixes