refacted code to use angular framework
Merge branch 'master' of https://github.com/kschieck/IncredibleEdible

Conflicts:
	public/js/controllers/controllers.js
things that mattered...