revision
Merge branch 'master' of https://github.com/Pifalo/framework

Conflicts:
	README.md
add
Adding base-level of the framework.js