Added autonomous code for kicking
Fix merge conflict.

Merge branch 'master' of https://github.com/ApesofWrath/FRC2014

Conflicts:
	src/edu/wpi/first/wpilibj/templates/FRC2014.java