Day 9
Merge branch 'master' of https://github.com/danghoa1/codingprojects

Conflicts:
	app.js