Parsing the data that comes in
Merge branch 'django' of github.com:sheldrand/podjump into work

Conflicts:
	djangoSite/podJump/views.py
adding todo