Baseurl and .gitignore
Breakpoint, style tweaks
Conflict