init
Merge branch 'master' of github.com:mipreamble/Collage

* 'master' of github.com:mipreamble/Collage:
  Initial commit

Conflicts:
	.gitignore
update
rm ignored files