ADding everything
Merge branch 'master' of https://github.com/jnguye14/Project1