Alex edit
Merge https://github.com/MikeNaha1/sample_app