Merge
Ignoring vim swp files.
Adding user