bug done all.js
done
Done conflit

Conflicts:
	index.html
	js/all.js