added lol
updated.gitignore
Merge remote-tracking branch 'origin/thomas'