Iniciando control git
Merge branch 'master' of https://github.com/vpiselli/startpoint

Conflicts:
	.gitignore
	README.md