Merge branch 'master'

Conflicts:
	FQH1L.cpp
	FQH2L.cpp
Merge branch 'master' of https://github.com/binarybin/FQH

Conflicts:
	FQH1L.cpp
	FQH2L.cpp