fixed two small bugs which resulted from me copying / pasting in the code
fixed two small bugs which resulted from me copying / pasting in the code
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into dan_changes
Merge pull request #126 from dbcfoxes2014/dan_changes

Dan changes