initial commit
Merge https://github.com/ShovelHand/sample_app