local 1
commit_message
Merge branch 'master' of https://github.com/chamilad/sample_app

Conflicts:
	README