i have no option
Merge branch 'master' of github.com:ipsita93/Orbital

Conflicts:
	NoQ/bin/NoQ.apk
	NoQ/bin/classes.dex
	NoQ/bin/classes/com/example/noq/Receipt1$2$2.class
	NoQ/bin/classes/com/example/noq/Receipt1$2.class
	NoQ/bin/classes/com/example/noq/Receipt1.class
	NoQ/bin/resources.ap_