Ritvvij Parikkh twitter updated
Merge branch '2014-eventframe' of github.com:hasgeek/fifthelephant into 2014-eventframe

Conflicts:
	templates/data/runup-event.html