Merge branch 'new_master' into camera
Merge branch 'new_master'
Merge branches 'camera', 'master' and 'new_master' of https://github.com/shsiung/CS121-LicensePlate into camera
Added simple list view. I will go back and add functionality to read our photos, and make our own CustomAdapter rather than a simple one
delete unused code
Merge branch 'new_master' into camera
update UI
Merge branch 'camera' into new_master