added entries to gitignore
Merge branch 'master' of github.com:CORE-POS/IS4C
moved special custdata
Merge branch 'master' of git://github.com/CORE-POS/IS4C
ignoring queries.log
Merge remote-tracking branch 'CORE/master'

Conflicts:
	fannie/.gitignore
Merge branch 'master' of github.com:CORE-POS/IS4C
Merge remote-tracking branch 'CORE/master'
Merge remote-tracking branch 'CORE/master'

Conflicts:
	fannie/sync/special/custdata.wfc.php
Merge remote-tracking branch 'CORE/master'

Conflicts:
	fannie/logs/queries.log
stupid queries log
Merge remote-tracking branch 'CORE/master'

Conflicts:
	fannie/logs/queries.log
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'