added geeky sci
Merge branch 'master' of https://github.com/welikepie/geekyconf

Conflicts:
	css/styles.css