fixed loop problem
asdfa
resolved conflict
Merge branch 'master' of ssh://github.com/gch-joa/gch_hack_hf