Personal computer commit before pulling the changes made in Lab
Merge branch 'master' of github.com:quinteroheg2/AndroidDS

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab1Quinteroheg2/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab1Quinteroheg2/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab2Quinteroheg2/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab2Quinteroheg2/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab2TestQuinteroheg2/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab2TestQuinteroheg2/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/32414299.index
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
Added a GitIgnore file