Merge pull request #1 from ScotteC/master

add .gitignore
Merge pull request #2 from ScotteC/Fabian

Merge pull request #1 from ScotteC/master