.
Merge remote-tracking branch 'remotes/github_site/master'

Conflicts:
	VisualABTS solution.v12.suo
houghLines function change, mainForm change, code fix
test from visual studio 2013 express