slide the content up and down
fixed conflicts
Merge pull request #21 from crotten/creatingHomePage

Getting the content to slide up and down