twitter&spot working
Merge branch 'master' of github.com:chrisbeard/hackcentral

Conflicts:
	index.html
add hackbu twitter