upload
Merge branch 'master' of github.com:838/etic-portfolio
addded basic editing