resolve conflict in README
resolve conflict in README

gmcvicker/WASP,bmvdgeijn/WASP,smozaffari/WASP,gmcvicker/WASP,smozaffari/WASP,smozaffari/WASP,gmcvicker/WASP,bmvdgeijn/WASP,cdeboever3/WASP,gmcvicker/WASP,bmvdgeijn/WASP,smozaffari/WASP,bmvdgeijn/WASP,cdeboever3/WASP,TheFraserLab/Hornet,smozaffari/WASP,cdeboever3/WASP,cdeboever3/WASP