Master
Merge branch 'master' of https://github.com/belldandyxtq/burstbuffer

Conflicts:
	Master.h