added gitignore
including changes from origin - hopefully will fix fast forward error
Merge remote-tracking branch 'origin/master'