Merge https://github.com/opensourcehk/2015.opensource.hk

Conflicts:
	index.html
Merge branch 'master' of https://github.com/sammyfung/2015.opensource.hk