updated
Merge branch 'master' of github.com:bleeding182/parcomp