Merge branch 'master' of /Users/speedbird/Workspaces/HackForHealth with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/master.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/master.js
Overview of medicins