closes #99 closes #103
Merge branch 'master' of github.com:m1kc/uonline

Conflicts:
	index.php
removed parent()