changes

d
messy merge from upstream
Newest

Update Ready…I hope
Merge pull request #7 from jen-jarvis/master

jen formatting post