split long join
merge
Merge branch 'master' of github.com:watermelon91/eecs584f14