Edited Welcome to Treehouse text fields to contain placeholder text.
Merge remote-tracking branch 'origin/master'