commented out bootstrap
merge
changed pictures
merge conflicts