added eclipse files to gitignore
Fixed lots of warnings
formatted according to eclipse format
refactored collision time