update
Merge branch 'master' of https://github.com/kldcty/origin

Conflicts:
	.gitignore
u