Merge pull request #125 from dbcfoxes2014/dan_changes

finally pushing this
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into dan_changes