this is

a ben test
Merge branch 'master' of https://github.com/AFenhoff/Greeter

Conflicts:
Greeter/LoginViewController.m
merged file

sync