Seed plus bootstrap
removing ng-app from seed
Angular seed plus bootstrap
Angular seed plus bootstrap
Angular seed plus bootstrap
Basic Controller Complete
Merge tag 'controller' of github.com:endermann/EventsAngularDemo

Basic Controller Complete

Conflicts:
	app/css/app.css
	app/index.html
	app/js/app.js
	app/js/controllers.js