added a dev branch
changed bg
Merge pull request #1 from vanillacowboy/myfeaturebranch

changed bg
bg changes
Merge pull request #2 from vanillacowboy/fixes

bg changes
added new margin to footer
more changes to margin
Merge pull request #3 from vanillacowboy/margin

Margin
margin change
Merge branch 'footer' into dev
fixed conflict
small changes
more margin
Merge pull request #6 from vanillacowboy/testing2

more margin
Merge pull request #7 from vanillacowboy/dev

merge dev to master