initial commit
Merge https://github.com/NavJ/collage