Last minute alterations
resolve conflict

Merge branch 'master' of https://github.com/JustinChu/STAT545A_MovieStats

Conflicts:
	README.md
resolve conflict