ss
Merge branch 'master' of https://github.com/catskay/yoga

Conflicts:
	public/script_1.pdf
	public/script_2.pdf
	public/script_3.pdf