Commit to avoid conflicts.
Merge branch 'master' of github.com:ericnormand/nord

Conflicts:
	resources/static/js/script.js