change structure
Merge branch 'develop' of https://github.com/buckshot90/tee-hee-server into develop

Conflicts:
	.idea/workspace.xml