Swiping now works
Merge branch 'master' of https://github.com/lsilverwolf/MobileProtoSprint3

Conflicts:
	Otters/Otters/src/main/java/com/sprint3/otters/ScreenSlideActivity.java