deleted swp file.
fix comflicts
Some updates.
addded files to reformat.
fixes