Real updates this time instead of the other, bad ones
Merge branch 'master' of https://github.com/awoody/wedding