I fixed everything!!!!!!!
Merge branch 'master' of github.com:ghmeier/ghmeier.github.io

Conflicts:
	expense.php