nathilen
Merge branch 'master' of git://github.com/charlenet/charlenet into charlenet-master

Conflicts:
	README.md
nathilen to add new stuff
Nathilen yet again
Merge remote-tracking branch 'upstream/master'