adding the first default route
Merge branch 'master' of GitHub:RobertPlant/Twitter

Conflicts:
	src/www/index.php
Merge branch 'master' of GitHub:RobertPlant/Twitter