Merge branch 'master' of github.com:JuanCabre/WCS_9th_Semester
First screen working