Changes.
Conflicts:
	js/preloader.js
	js/script.js