Merge pull request #8 from Caf131/dev-doo-dah-cforehand

Merge branch 'master' of https://github.com/JDlux/com-doo-dah-app into J...
Merge branch 'dev-doo-dah-cforehand' of https://github.com/Caf131/com-doo-dah-app into dev-doo-dah-cforehand