local repo
initial
Merge remote-tracking branch 'site/master' into site

Conflicts:
	.DS_Store
Added .gitignore
Slightly modified util
Merge branch 'master' of /Users/stephenbiston/gtm/flask/lib/python2.7/site-packages/mtgdb into site

Conflicts:
	.gitignore
Added a few tests, minor error handling