Character Swap in SheepHerderActivity
Merge branch 'master' of https://github.com/marcusvsilveira/lehman-android

Conflicts:
	SheepHerder/src/edu/lehman/android/SheepHerderActivity.java