basic matching algorithm
Merge branch 'master' of github.com:mhankowsky/magic

Conflicts:
	camera.html