Fixed JavaScript, Add logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	javascripts/script.js
	javascripts/script.min.js
	sass/styles.scss