fixed erros and added gitignore
resolved merge conflict
Merge pull request #1 from renepickhardt/master

please take my awesome change 
great!