Merge branches 'gh-pages' and 'master' of https://github.com/HackSpark/HackSpark-Website

Conflicts:
Revert "Merge branches 'gh-pages' and 'master' of https://github.com/HackSpark/HackSpark-Website"

This reverts commit bf7e429ba00f713a00fba5249add92c8ce88496b.