Syntax errors and added .gitignore.
Merge branch 'testopencv' of https://github.com/CatharticMonkey/ARDrone-UROP into testopencv

Conflicts:
	.gitignore
	build/controllertest
	build/sym_main
Removing conflicts.