added README.md
merge conflict
added new files
added parallax functionality
added new folders for parallax
fixed merge conflicts