Merge branch 'master' of https://github.com/codefastapps/0111_TestApp

Conflicts:
	README.md
Cleaned up things

Cleaned