merging layout branch
Merge branch 'layout' of github.com:kevinmcalear/outdoola_v2
Merge branch 'master' of github.com:kevinmcalear/outdoola_v2