Alec
Merge branch 'master' of https://github.com/moosemn456/TacoTruck

Conflicts:
	Web/account.php
alec