Merge github.com:vaidasgit/MedInfo

Conflicts:
	.gitignore