testee2
Merge branch 'master' of https://github.com/thaleslima/angular_examples

Conflicts:
	js/list_example.js