Output
Merge branch 'master' of https://github.com/jmhmd/fhirgamuts

Conflicts:
	routes/api.js