felipe
Merge branch 'master' of https://github.com/jsfelipe/agenda_angular

Conflicts:
	index.html
	js/funcoes.js