finished wireframes, updated footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	_03_part-two/movieInfo.html