Okay, got the repo set up
Merge branch 'master' of https://github.com/HershKrishna/My-Java-Stuff

Conflicts:
	.metadata/.mylyn/.taskListIndex/segments_1
	.metadata/.mylyn/repositories.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/version.ini