buttons almost finished
Merge branch 'master' of https://github.com/meet-projects/catdogs-yl1-2014