Modified gitignore
Removed DS Store
Merge remote-tracking branch 'upstream/master'

Conflicts:
	theme-local/.DS_Store
LIB001-427 art config to remove date and update to upper case
Merge pull request #26 from seesmith/master

LIB001-427 Art config changes and gitignore update