Loading file and tests
Load files stub
File loading ready
Changed collage.cabal , added lib
Revert "Changed collage.cabal , added lib"

This reverts commit c2cc3a76a7066d7526ef2445f6ec9b642386d996.
cMerge branch 'master' into Downloader

Conflicts:
	collage.cabal