moved stuff to layout from index
Merge branch 'billy_dev'

Conflicts:
	views/index.jade