Merge branch 'new_master'
new tagging branch
add new button
fix conflicts
Merge branches 'master', 'new_master' and 'tagging' of https://github.com/shsiung/CS121-LicensePlate into camera
Changed layout to fill parent so that it would adjust to different size screens
Realized I was making the rectangle completely wrong. Clear rectangle with opaque grey border works now