Merge pull request #5 from AaronGreenberg/master

getting the newest version on work computer
committing changes from our chat this morning
Merge pull request #8 from dknip/master

Pulling Danielle's most recent changes