Committing the setup of the app on my laptop
Merge remote-tracking branch 'origin/Joel'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt
.core.external.folders/.location

.metadata/.plugins/org.eclipse.core.resources/.projects/Troll/.indexes/a
0/5f/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Troll/.indexes/a
0/d6/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Troll/.indexes/p
roperties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/android-support-
v7-appcompat/.indexes/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-serv
ices_lib/.indexes/properties.index

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.
ui.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.co
re.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui
.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

.metadata/.plugins/org.eclipse.jdt.core/.org.eclipse.jdt.core.external.f
olders/.project
	.metadata/.plugins/org.eclipse.jdt.core/2237305497.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Added a git ignore file
Fixing the subfoldering issue
Fixing the subfoldering issue
Attempting to fix subfoldering issues
Fixed the subfoldering issue
Merge branch 'master' into Joel

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/Troll/.indexes/p
roperties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Troll/.markers

.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-serv
ices_lib/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/2.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.ec
lipse.adt.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide
.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2237305497.index
	.metadata/.plugins/org.eclipse.jdt.core/539621931.index
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
	google-play-services_lib/bin/google-play-services_lib.jar
	google-play-services_lib/project.properties