mkn getting up to date
conflicts at discussion branch although can't figure out why
Merge branch 'master' of github.com:mkness/TheCannon