First commit
Merge branch 'master' of https://github.com/Allanino/Test

Conflicts:
	.gitignore