Added if statements
Merge branch 'master' of https://github.com/12jroe/gitexample