added a choice of favorite color option
resolve merging conflict
added insult toward the user, completed code
Merge branch 'v2_demo'