update .gitignore to avoid *.swp
Merge branch 'master' into learn
finish the problem set 2 on udacity