mostly fixed contact2
trying to push Merge branch 'master' of https://github.com/jlastrachan/ServeUs