Primeiro commit
Merge branch 'master' of github.com:FlockLinx/myapp2

Conflicts:
	.gitignore