Added routing to the framework

Also updated the framework to version 0.3
Resolving conflict

Conflicts:
	composer.json