initial project version
Merge branch 'master' of https://github.com/rachelc91/Mini-Project-1