Updates !

+ added Wordpress nav code
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php