Initial import of project
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	.gitignore