Updated Encoder function
Merge pull request #1 from kmodlich/patch-1

Updated Encoder function
Update driveMethods.cpp
Merge pull request #2 from kmodlich/patch-2

Update driveMethods.cpp
removing the comment "TESTING"
Merge branch 'master' of https://github.com/abbott221/robotRepo

Conflicts:
	driveMethods.cpp