made changes
Merge branch 'master' of https://github.com/Chipman/ourProject
started doing carousel
Merge branch 'master' of https://github.com/Chipman/ourProject