navigation panel added
Merge remote-tracking branch 'origin/master'

Conflicts:
	designs/main.css