adds camera function. when camera image returns it is ok. but if you use a data.getData() call it crashes - this is null.
Merge branch 'master' of https://github.com/fishackathonTeamNoCal/android-TrawTraker

Conflicts:
	src/com/example/trawtracker/Start_PhotoLocation.java
push camera stuff i think....