minor change
Merge branch 'master' of https://github.com/rmorey/CHS4102-block-party

Conflicts:
	2014/autonomous.c
tabified