Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting
revert
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting

Conflicts:
	img/generated_canvas/filename_1.png
	img/generated_canvas/filename_10.png
	img/generated_canvas/filename_11.png
	img/generated_canvas/filename_2.png
	img/generated_canvas/filename_3.png
	img/generated_canvas/filename_4.png
	img/generated_canvas/filename_5.png
	img/generated_canvas/filename_6.png
	img/generated_canvas/filename_7.png
	img/generated_canvas/filename_8.png
	img/generated_canvas/filename_9.png
[new] beginning to verify
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting

Conflicts:
	application/controllers/canvas_data.php
	application/views/verification.php
	img/generated_canvas/filename_12.png
[new] links
[new] semi-functional routing to the fail/ success pages
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting

Conflicts:
	application/views/verification.php