model methods written, all tests passing
"model methods written, all tests passing"

Merge branch 'master' of github.com:ryanmrubin/pointoforder

Conflicts:
	pointoforder/models.py