Merge branch 'formatstring'
add gitignore and remove swap files
Merge branch 'formatstring'