Work from 12-18-14
Merge branch 'master' of https://github.com/tipsyTentacle/techStuck