Let's start !!
.gitignore
Merge branch 'master' of github.com:LD30-Lions/con-world

Conflicts:
	.gitignore
	README.md