Widget
Merge branch 'master' of https://github.com/AbstractShanxy/AbstractBugs

Conflicts:
	src/main.cpp