Updated .gitignore
Merge branch 'master' of https://github.com/johnjoeallen/Colony.git
Gumby added and working