README removed, README.md preserved
Merge branch 'master' of github.com:jfouquet/diap

Conflicts:
	README