Added some more layouts, as well as started on an interface for the server connection
Merge branch 'master' of github.com:gisvold/noahsprogark