added statement
Merge branch 'master' of https://github.com/Katannie/gitinit
resolved conflict