a
a
Merge branch 'master' of https://github.com/yotamgever/YLSMovies

Conflicts:
	.gitignore
	YLSMovies/MovieTheater.v11.suo
	YLSMovies/MovieTheater.v12.suo
	YLSMovies/MovieTheater/App_Data/MovieTheater.mdf
	YLSMovies/MovieTheater/App_Data/MovieTheater_log.ldf
	YLSMovies/MovieTheater/App_Data/aspnet-MovieTheater-20140923172343.mdf
	YLSMovies/MovieTheater/App_Data/aspnet-MovieTheater-20140923172343_log.ldf