Update README.md
Merge branch 'master' of https://github.com/jalopez13/jFramework-WebApp

Conflicts:
	README.md