Dammit Brady. Fixing your shit
Merge branch 'master' of https://github.com/stanleyhon/cse-helpme
Fixing merge conflicts