getting ready to pull sandt's changes
Merge branch 'master' of https://github.com/msandt3/body-heat