delete swp file
Merge branch 'master' of github.com:emiko/enju_trunk_circulation