initial commit
Merge branch 'master' of github.com:ignazioc/sample_repo_2

Conflicts:
	.gitignore