Merge pull request #1 from benjskim/master

First edit
Merge pull request #2 from benjskim/Layout-Setup

Merge pull request #1 from benjskim/master