html and modal
Merge branch 'master' of https://github.com/tomhanks23/TeamTian

Conflicts:
	index.php
modal login register start