BKlog
Merge branch 'master' of https://github.com/LegendaryAks/EMR

Conflicts:
	css/custom.css