added .swp to gitignore
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe
merge and delted weird file