work work work. doin work.
Merge branch 'master' of https://github.com/rebeccamurphy/Hackathon-2013

Conflicts:
	index.php

is it going to work?