Update README.md
Merge branch 'dev' of https://github.com/montemyk/chits_wah_emr

Conflicts:
	README.md
Merge branch 'dev' of https://github.com/montemyk/chits_wah_emr into dev

Conflicts:
	README.md

merge something
Merge remote-tracking branch 'origin' into dev