proper gitignore
comments in readme
Merge remote-tracking branch 'origin/master'