my solutions
second time
Merge branch 'master' of https://github.com/jahde/academyprep

Conflicts:
	README.md