Header completed
Merge branch 'master' of https://github.com/janetzhu/ap-project4