Public files (forlorn)
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/styles/tumblr.css
Added link on top nav Hellopoyt