Progra
Progra
Merge remote-tracking branch 'origin/master'

Conflicts:
	BD/Bikelltia.mwb
	BD/Bikelltia.sql
	img/Thumbs.db