this is my update
Merge branch 'master' of github.com:rsoden/epic

Conflicts:
	_data/publications.yml
added data for gscholar