cleaning up and last minute edits
Merge pull request #11 from hurtstotouchfire/pa1_turnin

cleaning up and last minute edits