added temp.db to .gitignore
Merge branch 'master' of github.com:crdunwel/cs132_final