Merge pull request #11 from allanmonzon/allan-branch

Allan branch
Merge pull request #12 from allanmonzon/allan-branch

adds footer border
fixed conflict
heyhey
Merge branch 'master' of github.com:sbaldwin24/Operation-Piercing-Swamp-Rabbit into justin-branch
Adds map marker and styling
Adds new header image
Merge pull request #14 from jhath16/justin-branch

Image Header
Merge branch 'master' of github.com:sbaldwin24/Operation-Piercing-Swamp-Rabbit into sara-branch

Conflicts:
	app/index.html
Fixes map
Merge pull request #15 from slkennedy/sara-branch

Fixes map
fixes pixel wide gap between image-container and page container
Merge branch 'master' of github.com:sbaldwin24/Operation-Piercing-Swamp-Rabbit into justin-branch
Merge pull request #16 from jhath16/justin-branch

Small image fix
Completes map
takes out section in mobile view