Merge branch 'master'
update last week work:　since I am not very familiar with the git, I update the whole folder instead of the individual files....
Resumit files for last week: adding grid to the content for all the pages
Editting the content of home page
Merge branch 'edittingBodyContent-2'

Conflicts:
	_project/css/main.css
	_project/home.html