Deleted some stuff
Sample tuples, fixed all errors.
Testing to see if commits work
more playing with git
Merge https://github.com/maggiechen/santa-inc
Merge branch 'master' of https://github.com/BrandonBlimp/santa-inc

Conflicts:
	src/login.php

Committing test message