Controllers
Merge branch 'master' of https://github.com/andressj6/idealize-me

Conflicts:
	idealize-me.iml