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

Conflicts:
	public/app/js/appuserlogin.js