looking at committed code
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/example/bikepitt/R.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/bikePitt.apk
	bin/classes.dex
	bin/resources.ap_
Merge remote-tracking branch 'origin/master'