[CONFIG] Idea Workspace GitIgnored
Merge branch 'master' of https://github.com/mreniu/gamerfell

Conflicts:
	.idea/workspace.xml
Workspace...again
Merge branch 'master' of https://github.com/mreniu/gamerfell

Conflicts:
	.idea/workspace.xml
[FEATURE] Add friendship between users w/ API REST and Callbacks and stuff