mysql connector lib
ehlp me?
Merge branch 'master' of https://github.com/blackdoor/Portunes

Conflicts:
	.classpath

I don't get merges