update readme
Merge branch 'master' of https://github.com/ludwiksh/Marksimos
Merge branch 'master' of https://github.com/ludwiksh/Marksimos
Merge branch 'master' of https://github.com/ludwiksh/Marksimos
update
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	package.json
Merge branch 'master' of https://github.com/ludwiksh/Marksimos