Added layout
Merge branch 'master' of github.com:szeng2013/EECS392