Initial Commit
Merge branch 'master' of github.com:guduchango/sample_app

Conflicts:
	README.md