deliverable 2 initial upload

check it out! go through it, make changes as you see necessary