Wheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
Merge branch 'master' of github.com:jamesonnuss/wdim361_final_project

Conflicts:
	core/classes/Film.php