fanchenpai/sample_app — pull request #1 by fanchenpai (2014-01-05 17:58:50+00:00)
Title: test merge

testing merge in local and remote