got a newExerciseDialogue to open
ok
Merge branch 'master' of https://github.com/kryzodoze/340-project

Conflicts:
	340_sqlite/340_sqlite.pro.user
Merge branch 'master' of https://github.com/kryzodoze/340-project
i think im all update???