Adding to .gitignore
Better bem
Readding index
Readding style
Reverting to original normalize
Merge remote-tracking branch 'origin/dev'

Conflicts:
	config.codekit