first commit
first commit
Merge branch 'master' of https://github.com/HelmComputers/Carousel

Conflicts:
	.gitignore