# Conflicts:
#	.gitignore
#	Cargo.lock
#	Cargo.toml
#	README.md
#	src/app.rs
#	src/app/ui/generation.rs
#	src/app/ui/layer_navigation.rs
#	src/app/ui/options.rs
#	src/app/update/logic.rs
#	src/app/view.rs
#	src/main.rs