Update .gitignore
remove swp files
Merge branch 'master' of https://github.com/hyoshid1/project375
Merge branch 'sam'
Merge branch 'sam'
update makefile
update makefile, .gitignore file
added calculations to optimize search. doesn't work yet