..
Merge branch 'master' of
https://github.com/botelhojp/lemas-extractor.git

Conflicts:
	src/main/java/lemas/db/DB.java