Initial commit
Merge branch 'master' of git@github.com:yinhe/sample_app.git

Conflicts:
	.gitignore