Project 1 Spec
Merge branch 'master' of https://github.com/rraina/370_p1

Combining both directories. Testing.