removing workspace.xml
no clue
Merge branch 'master' of https://github.com/prim1013/mean

Conflicts:
	.idea/workspace.xml