workspace.xml
Merge branch 'master' of https://github.com/KalleV/AngNewsAppTutorial

Conflicts:
	.idea/workspace.xml
Added '.idea' files to git ignore