Merge pull request #16 from stuycs-ml7-projects/zbranch

Zbranch main layout and design!
buttons look cool, I may have messed up other stuff