using django rest framework now, not tastypie
Merge remote-tracking branch 'origin/master'

Conflicts:
	notes.txt