Fixed twitter link
Merge branch 'develop'
Merge branch 'gh-pages'

Conflicts:
	js/scripts.js
	js/scripts.min.js
Updated scripts. Sorry
Merge branch 'master' into gh-pages