WIP
Merge branch 'develop' of github.com:seanchas/MXData into develop

Conflicts:
	.gitignore
WIP