Initial Commit
part 3
part 3
Merge branch 'master' of https://github.com/jennhuang/my-first-app

* 'master' of https://github.com/jennhuang/my-first-app:
  init
  Initial commit

Conflicts:
	HelloWorld