A
Merge branch 'master' of https://github.com/LuMaCoding/ClassFeedback-BackEnd

Conflicts:
	API/.idea/deployment.xml