Question 7
Merge branch 'master' of https://github.com/ghostotof/rsx-tp2

Conflicts:
	README.md