Keo's merging
Merge branch 'master' of https://github.com/keostrife/yearbook