update git ignore
update
js added
updates

Conflicts:
	config.codekit