Revert "fuck this shit. time to find bugs"

This reverts commit 7e06d6120f9a7dcd5701f52b23f96a6b7d263acb.

Conflicts:
	DiDj.pro.user
	mainwindow.h
	mainwindow.ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainwindow.cpp