fix new git merge
Merge branch 'master' of github.com:jeremiahxlin/jdev
remove portfolio