Add CameraPreview class
add pdf of design review to docs folder
Merge branch 'Nik_Branch' of https://github.com/njb26/3093_Software_Engineering_2013 into Nik_Branch

Conflicts:
	app/workspace/MemeApp/bin/classes/com/uc/memeapp/R$string.class
	app/workspace/MemeApp/gen/com/uc/memeapp/R.java

I'm not really sure what is happening