re

werwr
Merge branch 'master' of https://github.com/pazolo/pazoloRepository

Conflicts:
	README.txt