Practice setting up Controllers
Merge remote-tracking branch 'origin/master'

Conflicts:
	AngularJSDemos/app/controllers/controllers_practice5.js