Add .project to git ignore
update
Merge branch 'master' of https://github.com/unnamed38/fueldb.git

Conflicts:
	.project