Added getPace and getTimeOnTrail
Added call to update Distance Manager each time QR code scanned. Added first code scanned to list of segments.
Fixed a bug in stupidPathFinder. It's still just as dumb though.
Added warning that this branch isn't currently being updated.
Made a space then erased it. This is an important commit.
testing
Committing bunch of random class files.
Adding more class files. Need to find out how to uncommit and ignore these...
removed the class folders.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrailsApp/.settings/org.eclipse.jdt.core.prefs
	TrailsApp/bin/TrailsApp.apk
	TrailsApp/bin/classes.dex
	TrailsApp/bin/classes/android/support/v7/appcompat/R$anim.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$attr.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$bool.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$color.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$dimen.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$drawable.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$id.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$integer.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$layout.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$string.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$style.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R$styleable.class
	TrailsApp/bin/classes/android/support/v7/appcompat/R.class
	TrailsApp/bin/classes/com/orcs/trailsapp/BuildConfig.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$anim.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$attr.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$bool.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$color.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$dimen.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$drawable.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$id.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$integer.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$layout.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$string.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$style.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R$styleable.class
	TrailsApp/bin/classes/com/orcs/trailsapp/R.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/AchievementManager.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/BuildConfig.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/DisplayManager.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/DistanceManager.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/InputManager.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/MainActivity.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/R$attr.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/R$drawable.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/R$string.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/R$style.class
	TrailsApp/bin/classes/com/tcsorcs/trailsapp/R.class
	TrailsApp/bin/resources.ap_
	TrailsApp/gen/com/tcsorcs/trailsapp/R.java
Mergint tcsorcs code into demo code.
Merge remote-tracking branch 'upstream/master' into demo

Conflicts:
	TrailsApp/.classpath
	TrailsApp/.settings/org.eclipse.jdt.core.prefs
	TrailsApp/bin/TrailsApp.apk
	TrailsApp/bin/classes.dex
	TrailsApp/bin/resources.ap_
	TrailsApp/gen/com/tcsorcs/trailsapp/R.java
Merging again.
Merge remote-tracking branch 'origin/master' into demo

Conflicts:
	TrailsApp/.settings/org.eclipse.jdt.core.prefs
Merging remote demo branch into local demo branch.
Merge branch 'demo' of https://github.com/SHenney/trailsapp into demo
Corrected comment to avoid confusion.
Merge pull request #13 from SHenney/demo

Distance Manager update
Added gitignore file

Added gitignore file to ignore most (if not all) of the trash files we
don't need in the repo.
Merge pull request #4 from tcsorcs/master

Merging 12/9/2014