Controllers for angular, top image updated
Merge branch 'master' of https://github.com/team-synerjesus-experience/feel-frog
Structure for color setting based on mood done
Merge branch 'master' of https://github.com/team-synerjesus-experience/feel-frog

Conflicts:
	FeelFrog/Angular/app/css/app.css
	FeelFrog/Angular/app/index.html