Demo build

Tyler is heterosexual
Merge branch 'master' of https://github.com/grnnn/CS146-Project2