merging files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/AssignmentTracker/.indexes/e4/81/96/cb/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/AssignmentTracker/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/AssignmentTracker/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2857143765.index
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml