reverting merge

Edmond Yoo

2018-09-16 721d5e410e5a2b47ec2de722cc02fd6b9ed6b2fd

1
2
3
16 0.2929 0.6516 0.2627 0.5270
7 0.7453 0.2198 0.3476 0.1569
1 0.4540 0.4864 0.5653 0.5323