Added vim swap files to gitignore and got rid of one
Merge branch 'master' of https://github.com/paulmakl/CS315-Final