removed intro.markdown to avoid merge conflicts