Readme in markdown format
Merge branch 'master' of https://github.com/Neraste/maru_lab

Conflicts:
	README.md
Readme