Trying to fix issues .DS_Store files caused with merge
Trying to fix issues .DS_Store files caused with merge
Testing mozilla gradient for gh-pages
Ignoring ds_store files
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages

Conflicts:
	Project1Android/assets/www/.DS_Store
	Project1iOS/www/.DS_Store
	Project1iOS/www/css/.DS_Store