All good on the western front
Push from server
Merge branch 'master' of https://github.com/tehalexf/res-ex

Conflicts:
	index.php
	login.php
	verify.php
Push to server