Readme file
Merge branch 'master' of github.com:iw3hxn/LibrERP

Conflicts:
	wiki_wysiwyg_html/README.md
Github Readme File