blabla
Merge branch 'master' of https://github.com/danielquinnell/textingCasanova

Conflicts:
	conn.php

message fixing merge