Adding .gitignore to ignore tmp/
Merge branch 'master' of github.com:Jun-Dai/flim