Initial commit
Merge branch 'master' of https://github.com/kerkinos/ModernArt

Conflicts:
	.gitignore