banco de dados
quase tudo de volta desde a bomba atômica
szsadsasa
sadasdsa
Merge branch 'master' of https://github.com:443/gprimo/start-trekking

Conflicts:
	StartTrekking/assets/st_db.sqlite
	StartTrekking/src/com/example/starttrekking/DatabaseHelper.java