seajs_angularjs
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	js/app.js
	lib/angular-1.2.18/angular.min.js
	lib/jquery/jquery-2.1.1.js
seajs_angularjs