Initial commit
Merge branch 'master' of https://github.com/kanytu/AugmentedReality

Conflicts:
	.gitignore