Retrieving metadata from files.
Merge branch 'master' of github.com:larry482gr/researchgr

Conflicts:
	log/development.log