update git ignore
Adding further refactoring changes.
Merge branch 'master' of https://github.com/jintrone/ScholarMap

Conflicts:
	.idea/workspace.xml