some edits
merge Merge branch 'master' of https://github.com/kellyhennigan/SA2