added .classpath, .project for a standard Eclipse project
added .classpath .project to gitignore
removed some unnecessary import statements
Solving Merge Conflict