muhuhuhahaha
Merge branch 'master' of https://github.com/rafarave/SoftSchool

Conflicts:
	README.md