Test
Merge branch 'master' of github.com:ValRose/ECE425W1415

Conflicts:
	Lab3/lab3demo/lab3demo/AvoidAndGo.h