merging
Merge branch 'master' of https://github.com/ProjPossibility/2014-CSUN-CareTaker-2

Conflicts:
	gen/com/example/deadreckoning/R.java