layout model for text and button
Merge branch 'devmerge' of https://github.com/480Oswego2013/CSC-HCI-480-2013-repo into devmerge