Add .gitignore
Add several classes
Merge remote-tracking branch 'origin/master'