add idea/workspace.xml and idea/scope_settings.xml files to .gitignore
Merge branch 'master' of https://github.com/greekins/RedditCloneJS

Conflicts:
	.gitignore