edited gitignore
2nd
Merge https://github.com/cocaineteddybear/viktortherobot