UI version beta
Merge branch 'master' of https://github.com/rovyoper/TB-CG-Final.git
UI vesion beta