merge functions, initialize, header
merge conflict fix
merge fix
fix initialize merge
in confused state I said ignore initialize and functions-> changed back
hopefully fix conflicts between machines
Merge branch 'master' of https://github.com/mbrick02/danielsmtn

Conflicts:
	includes/initialize.php