Need to update via pull.
Merge branch 'master' of https://github.com/Ulysses69/gitcms

Conflicts:
	inc/js/scripts.js