populate my content
Merge branch 'master' of https://github.com/Kenrick-Zhou/bitstarter

Conflicts:
	index.html