Merge branch 'buck' of https://github.com/CS1635-ClassMe/Repo2 into robert
manifest
Merge branch 'robert' of https://github.com/CS1635-ClassMe/Repo2 into buck
Manifest change