development log
development log
Merge remote-tracking branch 'origin/master'

Conflicts:
	bestnid-grupo2/log/development.log