Completed import and tested
checking errors
Merge branch 'master' of https://github.com/7h0m4s/Primate

Conflicts:
	static/test file.psafe3