first commit
Merge https://github.com/taylyq/09302014_app