initial commit of index, users, and common
Merge branch 'master' of git://github.com/johnnyg12791/cs155proj2

Conflicts:
	includes/common.php
	index.php
	users.php
trying to fix git
got up to date