Added an uplad class for the component images
Added .swp to the gitignore
Removed some .swp files
Merging