updated android manifest
fixed merge errors
Merge branch 'master' of https://github.com/asell/cis350
added fonts and background image