optimize solve6 and solve7
Merge branch 'master' of https://github.com/Yummyyum/DF

Conflicts:
	solution.cpp