Minor merge
Ignoring eclipse files
Sneer main model progress.