Worked on Welcome Mat
merged conflicts with app.js