Attempted to fix line grouping... still working
Got the final line filtering done
Fixed bug in hough
Merge branch 'master' of github.com:mackorone/mousee
I deleted everything cause of merge conflicts

Conflicts:
	final/cvpr2014AuthorKit/latex/egpaper_final.log
	final/cvpr2014AuthorKit/latex/egpaper_final.pdf
	final/cvpr2014AuthorKit/latex/egpaper_final.synctex.gz
Merge branch 'master' of github.com:mackorone/mousee

Conflicts:
	final/report/report.aux
	final/report/report.log
	final/report/report.pdf
	final/report/report.synctex.gz
	final/report/report.tex