address book messing around .sln
fixed merge conflit
Merge branch 'master' of github.com:Elementalbrood/TheAddressBook