Initial commit
Merge branch 'master' of https://github.com/roshenw/first_app

Conflicts:
	README.md