Updated Eclipse files.
Resolved merge conflicts.
Scaffolded the basis of project 1 - tip calculator.