.gitignore
Merge remote-tracking branch 'origin/eclipse_git' into eclipse_git

Conflicts:
	Solar/.gitignore