Cleardb
Merge branch 'master' of heroku.com:perspective-app

Conflicts:
	connect.php
db fix