pieces snap into place without jumping
Merge branch 'master' of https://github.com/Ccook/toddler-selfie

Conflicts:
	src/edu/american/toddlerselfie/FullscreenActivity.java
Reset button works
Merge branch 'master' of https://github.com/Ccook/toddler-selfie

Conflicts:
	src/edu/american/toddlerselfie/FullscreenActivity.java