Merge branch 'master' of https://github.com/yosychenko/cpp-lame-parser

Conflicts:
	README.md