changes
Merge branch 'master' of github.com:asmt3/thepromise
done for the night