First commit
fixed gitignore
Merge remote-tracking branch 'github/master'