CSS Position Header + Nav + Welcome
CSS Header + Slideshow
Merge remote-tracking branch 'origin/development'

Conflicts:
	index.html
Merge Development