Very raw version of bubo sandbox
updated .gitignore file
Merge remote-tracking branch 'upstream/master'