Update
Update
Merge branch 'master' of https://github.com/jarquafelmu/Pathway

Conflicts:
	styles/header-footer.css