Merge branch 'master' of https://github.com/tomekwi/collabtive
Merge branch 'master' of https://github.com/tomekwi/collabtive
Added .gitignore