Added ignore for local settings files in this fork.
Including expModal fix, with jQuery.noConflict, in articleTemplate.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	conDB.php
	templates/articleTemplate.php
TESTING Git setup with inconsequential change to .gitignore.
Merge branch 'modalFixes' of https://github.com/apricated/circulate into apricated-modalFixes