Try Commit using PyCharm
Added rest framework
Merge branch 'master' of https://github.com/jarrodtoh/proteus

Conflicts:
	.idea/workspace.xml
	prime/models.pyc
	templates/index.html
	templates/login.html