variable added
person added
added if statement
added another comment
merged branches
merge with master