Merge pull request #1 from Jason-F/master

merging
Android Viewer

This allows you to view the webpage
Merge pull request #8 from DavidWinterbach/master

Update and code