Added favorite color line.
Merge branch 'testbranch'
Changes favorite color.