merge frontend to master #26

Closed chinster99 closed 3 years ago