this isnt really working...
getting there...
cleanup
Merge branch 'master' into doing-our-own-thing

Conflicts:
	adopt4k_server/api/views.py
fixes bug
Merge branch 'doing-our-own-thing'
merging
Merge branch 'doing-our-own-thing'