initial commit
Merge branch 'master' of https://github.com/exploser/3d

Conflicts:
	.gitignore