deploy
Merge branch 'master' of https://github.com/ht4n/Pilpres2014staging

Conflicts:
	index.html
merged index.html?
deploy