Updates on log, read me and ignore files
* Removed the tmp folder from future git commits
* modified read me
* added original conflicting Task.java file as backlog