Bug-fix !
Merge branch 'master' of github.com:AbstractShanxy/AbstractBugs

Conflicts:
	src/main.cpp