merged the two apps together and its pretty broken
Merge pull request #85 from mbaptist23/laboffline

merged the two apps together and its pretty broken