Merge branch 'master' of https://github.com/ryelle/Mill-Falls-GiveCamp-2014