my first app
we made some chnage
Merge branch 'master' of https://github.com/darrylsharp/meme-ing-of-life