add settings to gitignore
merge conflict
fixed .ety
Merge branch 'skynet' of https://github.com/elliottcarlson/MongoBot into skynet
Merge pull request #91 from elliottcarlson/skynet

fixed .ety