Fix conflicts
Merge branch 'master' of github.com:joulesqrd/cs224u-wiki-generator

Conflicts:
	.DS_Store