Some very basic layout in place, but links not working
Merge branch 'master' of github.com:mayormcmatt/birdhaus
resolves conflicts