Initial commit
Merge branch 'master' of https://github.com/wesleyemw/test-git

Conflicts:
	.gitignore