Day 2 exercises, update homepage with correct info
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	index.html
Merge pull request #4 from Tiger0915/gh-pages

Day 2 exercises, update homepage with correct info