Remove accidentally checked in .swp file
Merge remote-tracking branch 'origin/master'