Deleted nginx.conf from the other_conf directory not in wqflask
Merge branch 'flask' of http://github.com/zsloan/genenetwork into flask