git pull
Merge branch 'master' of https://github.com/bigtotorouk/simple_client_server
add a imageField for onedayonejoke/models.py and aciton in onedayonejoke/view.py