gitignore .swp
Merge branch 'master' of https://github.com/maistho/tdp024