last cahnges no progress
trying to sync up github
Merge branch 'master' of https://github.com/KSMSbotball/2014

Conflicts:
	botball2014/B team programs/group b KIPR/Milestone1.c