"tray again with intelliJ
Merge branch 'master' of https://github.com/bennolo/simpleSQLite
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml