some changes
Merge branch 'master' of https://github.com/Pastacat/TwitterClone

Conflicts:
	SQLQuery.php
	login.php