Q
Merge branch 'master' of github.com:88Alex/toml-cpp

Conflicts:
	src/TomlParser.cpp