login
Merge branch 'master' of https://github.com/bcarson19/Burger-Bar

Conflicts:
	index.php