collaborative and content
collab
Merge branch 'master' of github.com:mcmhav/muchBazar
intro and some todos
Merge branch 'master' of github.com:mcmhav/muchBazar