first commit
Merge branch 'master' of github.com:BraisFreire/stars-web

Conflicts:
	.gitignore