ran locally
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

merged session 15
Merge pull request #22 from mattgiguere/master

merged new session