charts Latest version
Merge branch 'master' of https://github.com/FunkeyFlo/seflab05

Conflicts:
	SEFLab/functions/login.php