step commit
Merge branch 'master' of justinGH:tmwilder/d2modeling

Conflicts:
	data/datdota.py
Adding dbfile ignore to our .gitignore