Homework 2.1
Merge branch 'hw21'
added vim *.swp files to .gitignore