try to pull
Merge branch 'master' of https://github.com/Nicktho/hotair
add /roll and /flip
/flip and /roll
fix merge