moved things around
Merge https://github.com/makersauce/pubmark

Conflicts:
	index.php
moving things around