going to do a checkout
change one
change two
Revert "change one"

This reverts commit 27b05f0a8771af8d9ffa57411df321eb6d434fee.

Conflicts:
	index.php
ongoing stuff
test one
committing changes to test branch 2
pre major changes
some work on adding orders
taxes, set up helper
major commit pre switching branch