add house and some social experience
Merge branch 'master' of github.com:rogerluo/note

Conflicts:
	roger.html