ignore
ignore
Merge commit 'HEAD@{1}'

Conflicts:
	bin/SMMovieTime.apk
	bin/classes.dex
	bin/classes/com/sm/movietime/Launcher$PopulateMovieTable.class
	bin/classes/com/sm/movietime/Launcher$PopulateScheduleTable.class
	bin/classes/com/sm/movietime/PurchaseBreakdown.class
	bin/classes/com/sm/movietime/R$id.class
	bin/classes/com/sm/movietime/R$layout.class
	bin/classes/com/sm/movietime/R$menu.class
	bin/classes/com/sm/movietime/R$string.class
	bin/classes/com/sm/movietime/R$style.class
	bin/classes/com/sm/movietime/R$styleable.class
	bin/classes/com/sm/movietime/ReserveSeats.class
	bin/classes/com/sm/movietime/Schedules.class
	bin/classes/com/sm/movietime/SpecificLocationActivity$ListAdapter.class
	bin/resources.ap_

commit message