login form
Merge branch 'master' of https://github.com/Red-Rover-Team/Red-Rover-Gallery

Conflicts:
	index.php
	register.php