Fixed PUT method on server
Unstaging .idea from git again...
Merge branch 'serverTesting'

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml