change welcome
Merge branch 'master' of https://github.com/Deuanz/SWproject