hi
Merge branch 'master' of https://github.com/thejoonshow/Passy-By

Conflicts:
	bin/PassBy.apk
	bin/classes.dex
	bin/classes/com/app/dev/dreamteam/passby/R$string.class
	bin/classes/com/app/dev/dreamteam/passby/R$style.class
	bin/classes/com/app/dev/dreamteam/passby/R$styleable.class
	bin/resources.ap_
	gen/com/app/dev/dreamteam/passby/R.java
Merge branch 'master' of https://github.com/thejoonshow/Passy-By
yo