Resolving problems with VCS. Also writing a 'hello world' test app.