Updated scripts
Merge branch 'gh-pages'

Conflicts:
	js/scripts.js
	js/scripts.min.js