added swp from vim
Merge branch 'master' of https://github.com/donhill/clientview
fixed merge in .gitignore, added vim swp
added pik to .gitignore