begin using angular.js
begin using angular.js
Merge branch 'master' of https://github.com/cranberryofdoom/dida-dashboard

Conflicts:
	app/views/teams/index.html.erb