ignore
Merge branch 'master' of https://github.com/karenlechoco/SMMovieTime

Conflicts:
	bin/SMMovieTime.apk
	bin/classes.dex
	bin/classes/com/sm/movietime/CinemaLogin$2.class
	bin/classes/com/sm/movietime/CinemaSignup$1.class
	bin/classes/com/sm/movietime/MovieDetails.class
	bin/classes/com/sm/movietime/NextAttraction.class
	bin/classes/com/sm/movietime/NowShowing.class
	bin/classes/com/sm/movietime/ReserveSeats$10.class
	bin/classes/com/sm/movietime/ReserveSeats$11.class
	bin/classes/com/sm/movietime/ReserveSeats$12.class
	bin/classes/com/sm/movietime/ReserveSeats$13.class
	bin/classes/com/sm/movietime/ReserveSeats$14.class
	bin/classes/com/sm/movietime/ReserveSeats$15.class
	bin/classes/com/sm/movietime/ReserveSeats$16.class
	bin/classes/com/sm/movietime/ReserveSeats$17.class
	bin/classes/com/sm/movietime/ReserveSeats$18.class
	bin/classes/com/sm/movietime/ReserveSeats$3.class
	bin/classes/com/sm/movietime/ReserveSeats$4.class
	bin/classes/com/sm/movietime/ReserveSeats$5.class
	bin/classes/com/sm/movietime/ReserveSeats$6.class
	bin/classes/com/sm/movietime/ReserveSeats$7.class
	bin/classes/com/sm/movietime/ReserveSeats$8.class
	bin/classes/com/sm/movietime/ReserveSeats$9.class
	bin/classes/com/sm/movietime/tabmenu.class
	bin/dexedLibs/android-support-v4-7a0592d218b07bbe4132d677336245c5.jar
	bin/resources.ap_

commit message