Initial commit
Merge and add vim swaps to gitignore