commiting controller file
Merge branch 'HW5' of https://github.com/edroderick/ECE590-HW1 into HW5

Conflicts:
	controller-p.py