gitignore
Merge branch 'master' of https://github.com/pranj/ECE457AProject