Merge branch 'master' of https://github.com/omer414/bluelinemed

Conflicts:
	changes.docx
	~$hanges.docx