Merge branch 'master' into nate_branch
Merge branch 'master' into nate_branch
updated layout
Merge branch 'nate_branch'