init
Added FileStore class
Added *.swp files to ignore list
Merge remote-tracking branch 'origin/master'