c
Merge branch 'master' of https://github.com/scotthso/100Days

Conflicts:
	index.html
blog update