Merge pull request #5 from olivier-squid/master

ignore .project
Update README.md
Merge pull request #6 from olivier-squid/master

minor fixes
Merge pull request #7 from olivier-squid/master

added bootstrap and did some cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md