first commit
First Commit Master DEV 1...
Merge branch 'master' of https://github.com/joelauliet/DEV1

Conflicts:
	.gitignore