Merge branch 'master' of https://github.com/ariel32/Ingress
Merge branch 'master' of https://github.com/ariel32/Ingress