blasdlfkjasdf
sdfljasdlkf;Merge branch 'master' of https://github.com/jlastrachan/ServeUs
pulling Merge branch 'master' of https://github.com/jlastrachan/ServeUs
pulling the new stuff Merge branch 'master' of https://github.com/jlastrachan/ServeUs
want to pull new changes
 trying to pull new stuff Merge branch 'master' of https://github.com/jlastrachan/ServeUs
trying to pull
fixed merge conflicts
 staying updated Merge branch 'master' of https://github.com/jlastrachan/ServeUs