array
Merge branch 'master' of https://github.com/rhysl/parttimemaidorg

Conflicts:
	views/footer.php
footer cleanup
Irmak Array Assistance