ed gitignore
Merge https://github.com/cocaineteddybear/viktortherobot