updated
Updated crap
Merge branch 'master' of https://github.com/violatingcp/BaconAna