added time
Merge branch 'master' of ssh://github.com/mec07/nback
Changed Stimulus to a Drag and Drop Widget and attached it to parent for drag functionality.
Merge branch 'master' of ssh://github.com/mec07/nback
drag and drop functionality and some button shenanigans
Merge branch 'master' of ssh://github.com/mec07/nback

Conflicts:
	main.py
Merged
Merge branch 'master' of ssh://github.com/mec07/nback

Conflicts:
	main.py

Megamerge