fixed problems with bad merge
Merge branch 'master' of github.com:tjweisman/bn_writeups
Merge branch 'writeup_mergefix'