Fixed image taking up too much space
Added test assertion
Merge branch 'master' of github.com:travisolbrich/315-P3-Android