Merge pull request #2 from opensourcehk/master

merge with OSHK master branch
Merge https://github.com/opensourcehk/2015.opensource.hk

Conflicts:
	index.html
Merge branch 'master' of https://github.com/sammyfung/2015.opensource.hk
Merge pull request #23 from sammyfung/master

merge with sammy master branch