footer test
Merge branch 'master' of https://github.com/ldleman/yana-server

Conflicts:
	footer.php