by 67
Merge branch 'master' of https://github.com/chopperkuang/angular-demo

Conflicts:
	index.html
	js/controller.js