added new things
Merge branch 'master' of https://github.com/neoprez/adschool

Conflicts:
	connect.php