mkn getting up to date
conflicts at discussion branch although can't figure out why
Merge branch 'master' of github.com:mkness/TheCannon
wrapping lines: readability
more readability
updating to png figures
notes to self; acks
minor
acknow added
Merge https://github.com/mkness/TheCannon

as per instructions of Prof. Hogg
as per instructions by Dr. Hogg