Initial commit.
update from work
update
Maybe this time it will work.
small edits.
Added .gitignore
removing *.swp files and *.*~ files
Merge remote-tracking branch 'origin/master'