init commit
Merged from GitHub project

Conflicts:
	.gitignore