edited readme; upload keeps on working
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/db-connect.php