Added eclipse project configuration and java class file to git ignore
list to avoid future conflicts
Resolved merge conflict within comment block
Added local project classpath file used for junit to list of ignored files