Merge frontend work
Merge branch 'master' of https://github.com/rising-thunder/G4M3