some changes
Merge branch 'master' of github.com:Vector919/HofstraCreateAPI

Conflicts:
	core/views.py