Eitan's feature
Merge branch 'master' of git://github.com/ro11intitewhips/MoviesGalore

Conflicts:
	lololol.txt