Angular controller added
Merge https://github.com/favio41/starter into stock

Conflicts:
	views/bottom.ejs
Some changes