Merge branch 'master' of https://github.com/orangebutter/OpenSource-13-10

Conflicts:
	homework/Eucalyptus VS.OpenStack+OpenSource011.md
Merge branch 'master' of https://github.com/orangebutter/OpenSource-13-10