just weird
ok hopefully back on track
push damn you! :)
Merge branch 'master' of https://github.com/geraldbullard/gnscms

Conflicts:
	admin/inc/menu.php
	admin/js/charisma.js
	fpgallery.php