this is our first commit
Merge branch 'master' of https://github.com/sokchea/mySite
first try

Conflicts:
	home.html
	index.html
wondering try