removed swp file
updated chrome extension to get prototype working
fixed merge conflict