rm swp
Merge branch 'master' of https://github.com/ttian20/manager