navigation and backgrounds
parashutter.html
Merge remote-tracking branch 'origin/alex/master' into arturo/master

Conflicts:
	public/index.html