update level_2
update
update
update li
sdf
Merge branch 'master' of https://github.com/samjhill/6g1w

Conflicts:
	gallery.php
	images/prof.jpg
	navigation_level2.php