Adding onResume().
Merge branch 'master' of https://github.com/ralewis85/NerfCV.git

Conflicts:
	nerfCV/bin/classes/com/example/nerfcv/MainActivity.class
	nerfCV/src/com/example/nerfcv/MainActivity.java