Add .gitignore
Merge remote-tracking branch 'origin/master'
Remove a lot of random files added by mistake
Re-add accidentally deleted files