asf
Merge branch 'master' of github.com:alexlovesprogramming/cross-country-app

Conflicts:
	.metadata/.mylyn/tasks.xml.zip
	.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/AppTemplate/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/AppTemplate/.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/6.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png