update
r to be conflicted
Merge branch 'master' of https://github.com/melvrickgoh/LateLiao

Conflicts:
	IDP/gen/com/idp/R.java
Merge branch 'master' of https://github.com/melvrickgoh/LateLiao

Conflicts:
	IDP/gen/com/idp/R.java
	IDP/res/values/strings.xml
	IDP/src/com/idp/MainActivity.java