fixed gesture to flash
fixed gesture to flash/mergeconflict
swipe up for flash
Merge branch 'master' of github.com:dianeyang/hackmit
Merge branch 'master' of github.com:dianeyang/hackmit