New TouchView class that implements android fling listener
Cleaner swiping
Merge https://github.com/feitelsonc/CatchPhrase

Conflicts:
	res/layout/activity_main.xml
	src/com/cs185/catchphrase/MainActivity.java