First commit
gitignore update
Merge branch 'master' of github.com:nemogiftsun/sot-collision