commit test
Merge branch 'development' into theme-setup
footer change
Basic layout for pages
Merge branch 'Josh' into development
CSS changes
Merge branch 'Josh' into development
Merge branch 'development' into DJ
Fixed up CSS and layout
Renamed some files correctly