Conflicts: seed/challenges/basic-javascript.json seed/challenges/bootstrap.json seed/challenges/html5-and-css.json seed/challenges/object-oriented-and-functional-programming.json
Everything to do with the server.
One file that is not tracked here is rev-manifest.json.
It is generated at runtime and its contents changes as the contents
of client side files change.