fixing stuff
 meow Merge branch 'master' of https://github.com/jlastrachan/ServeUs
update