merge
Merge branch 'master' of github.com:shhider/CodingEveryday

Conflicts:
	FrontEnd/img/avatar.jpg
	FrontEnd/myhome.html