fconect

conect??
Merge branch 'master' of https://github.com/joasssko/cuprumapp

Conflicts:
	connect.php