Basic Layout
Merge branch 'master' of https://github.com/rseto88/368-final