Wonderful bullets!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mycroft.cpp
Handle conflict
Merge branch 'master' of https://github.com/Mycroft-Org/Mycroft