edit1
Merge branch 'master' of https://github.com/alexdevine/Fineline

Conflicts:
	memorial-cards.php