styles footer
Merge branch 'master' of https://github.com/sbaldwin24/Operation-Piercing-Swamp-Rabbit into allan-branch
fixes conflict
Conflicts:
	app/styles/main.scss
Merge pull request #7 from allanmonzon/allan-branch

Allan branch