Simple Navigation
Merge branch 'master' of https://github.com/jewpaltz/webdev2014

Conflicts:
	Playground/SimpleNavigation/index.php
Database Design