Added missing files
Merge pull request #3 from pyrosim/master

Added missing files
Merge pull request #1 from tcsorcs/master

Updating my fork
Added hook for DistMan

Added in a hook for DistanceManager to call to manually add an
achievement.
Merge pull request #4 from HypnoticSheep/master

Added Manual Achievement Awarding
Merge pull request #5 from SHenney/master

Pulling in Sarah's changes
Merge pull request #2 from tcsorcs/master

syncing to local branch
Fixed issues

Fixed some build issues stemming from merged code. Also committing
R-related files, though I'm not sure it's necessary.
Merge pull request #6 from HypnoticSheep/master

Fixed Merge Issues
Minor Changes
Merge pull request #7 from HypnoticSheep/master

Minor Changes
Merge pull request #1 from tcsorcs/master

yay
Merge pull request #8 from mdkiemle/master

Merge pull request #1 from tcsorcs/master
Added warning that this branch isn't currently being updated.
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