log
fix conflict
add gitignore
fix things
add images
remove log
fix saber locations