Merge branch 'glue' into frontend
Merge branch 'frontend' of github.com:tkw1536/Jayducks into frontend
Merge branch 'glue' into frontend