Merge branch 'master' of github.com:adamwong246/adamwong246.github.io

Conflicts:
	css/main.css
	index.html