changed again
Merge conflict solved
Merge branch 'master' of github.com:kingmuscle/Hello_Info3