save premerge
Merge branch 'master' of https://github.com/ssterman/cs376
added football story