A commit by natewallace.
Merge branch 'master' of https://github.com/natewallace/MetaDataExplorer

Conflicts:
	README