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

Conflicts:
css/EmotionSelectionView.css
Merge pull request #8 from Caf131/dev-doo-dah-cforehand

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