back projection with hs tracking
begin recognition
time to begin the recognition phase - booom!
Merge remote-tracking branch 'origin/everything'

Conflicts:
	omp/run.py
Merge pull request #1 from VoidMee/everything

merge master and everything