iz
Merge branch 'master' of https://github.com/Ladoria/csli_project

Conflicts:
	easySecureScript
i
tre