shamma's
Merge branch 'master' of https://github.com/sarahmustafa/tickety

Conflicts:
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
image
views+jaasim's seats
Merge branch 'master' of https://github.com/sarahmustafa/tickety