Initial commit
Merge branch 'master' of github.com:Seppone/QObjRec
Merge branch 'master' into develop

Conflicts:
	.gitignore