update
Merge branch 'master' of https://github.com/woook/regi

Conflicts:
	Portfolio3.txt

update merge
update
update