Merge pull request #1 from JDlux/dev-dohan

Added EmotionSelectView and LoginView
Merge pull request #2 from JDlux/dev-dohan

Updated each .html view to current styling
Added ActivitySummaryViewControl, plus other classes
Merge pull request #3 from Caf131/dev-doo-dah-cforehand

Added ActivitySummaryViewControl, plus other classes
Clean up
Merge pull request #4 from Caf131/dev-doo-dah-cforehand

Clean up
Added some files
Merge pull request #5 from Caf131/dev-doo-dah-cforehand

Added some files
back
ok looks back to normal
Merge pull request #6 from Caf131/dev-doo-dah-cforehand

Dev doo dah cforehand
Create EmotionSelection.php
Create MoodProfile.php
Create MoodProfileView.css
Create EmotionSelectionView.css
Merge branch 'master' of https://github.com/JDlux/com-doo-dah-app into JDlux-master

Conflicts:
	css/EmotionSelectionView.css
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...
Merge pull request #10 from Caf131/JDlux-master

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