1. coomit
Merge branch 'master' of https://github.com/simonpang/light-bike

Conflicts:
	LightBike/src/com/example/lightbike/qrcode/MipcaActivityCapture.java
1.commit
Merge branch 'master' of https://github.com/simonpang/light-bike
1.commit