Added .swp to gitignore
Merge branch 'master' of https://github.com/jessicatysu/ML