Removed swapfile
Merge branch 'master' of github.com:gisikw/samantha