configure code, navigation and add flex-video
merge conflicts
edit gitignore