Merge pull request #5 from jklemke03/jklemkebranch

Fix AndroidManifest as well as other changes
Merge pull request #6 from Draedalus/master

Merging Master into local
Remade changes from earlier botched commit and push
Merge pull request #7 from Draedalus/Local

Changed file names for future change in activity
Added SetText that updates the hex binary and octal fields when decimal
is inputted and button is pushed