something
Merge branch 'master' of https://github.com/pzhao1/CS97FinalProject
fixed gradle to be compatible with lab computers