Testing backend
testing backend
Merge branch 'master' of https://github.com/desmond/waterloo-hackathon-2013

Conflicts:
	backend.php
Merge branch 'master' of https://github.com/desmond/waterloo-hackathon-2013
Testing ajax
Merge branch 'master' of https://github.com/desmond/waterloo-hackathon-2013