no message
Merge branch 'master' of https://github.com/altenorjr/wared-beducy
Merge branch 'master' of https://github.com/altenorjr/wared-beducy
no message
Merge branch 'master' of https://github.com/altenorjr/wared-beducy

Conflicts:
	www/index.html