pull merge and celaned conflicts
fixec conflicts
pic hiver works, but is slow
fxed conflicts and added pic style to qtip
Merge branch 'master' of https://github.com/huyettcp/project_2_crossword