sfsdf
Merge branch 'master' of github.com:meatcar/augmented-reality

Conflicts:
	view.py
weird rebase issue resolved