Created Eclipse project
Merge remote-tracking branch 'origin/master'

Conflicts:
	.project
	README.md