updated
was able to compile everything
refactored again . . . still compiles
moved web content over . . . issues with start
Merge branch 'master' of https://github.com/nathandunn/Apollo