test
Merge branch 'master' of https://github.com/loydvan/loydvan

Conflicts:
	footer.php