Fixed typo: ist is now is in description of FOSSASIA.
Merge branch 'master' of https://github.com/chaconne7/fossasia.github.io into chaconne7-master

Conflicts:
	index.html
Merge branch 'chaconne7-master'
Merge branch 'master' of https://github.com/fossasia/fossasia.github.io