dealing conflict
Merge branch 'master' of github.com:TedForV/MSCMainPage