Almost working first prototype
Merge branch 'master' of https://github.com/mattpatrick/Luna-Demo
This commit is necessary as there are no relevant changes in this branch
Merge branch 'master' of https://github.com/mattpatrick/Luna-Demo
This branch is not current with the newest branch