added testfiles, and learned a bit about branching and staging