Conflicts:
	src/stan/gm/command.hpp
	src/test/models/basic_distributions/binormal_test.cpp
	src/test/models/basic_distributions/inv_wishart_test.cpp
	src/test/models/basic_distributions/normal_mixture_test.cpp
	src/test/models/basic_distributions/normal_test.cpp
	src/test/models/basic_distributions/ordered_pair_test.cpp
	src/test/models/basic_distributions/sorted_pair_test.cpp
	src/test/models/basic_distributions/triangle_test.cpp
	src/test/models/basic_distributions/uniform_test.cpp
	src/test/models/basic_distributions/wishart2_test.cpp
	src/test/models/basic_distributions/wishart2x2_test.cpp
	src/test/models/basic_distributions/wishart_test.cpp
	src/test/models/basic_estimators/bernoulli_test.cpp
	src/test/models/basic_estimators/normal_loc_test.cpp
	src/test/models/basic_estimators/normal_mixture_test.cpp
	src/test/models/bugs_examples/vol1/blocker/blocker_test.cpp
	src/test/models/bugs_examples/vol1/bones/bones_test.cpp
	src/test/models/bugs_examples/vol1/dogs/dogs_test.cpp
	src/test/models/bugs_examples/vol1/dyes/dyes_test.cpp
	src/test/models/bugs_examples/vol1/epil/epil_test.cpp
	src/test/models/bugs_examples/vol1/equiv/equiv_test.cpp
	src/test/models/bugs_examples/vol1/inhalers/inhalers_test.cpp
	src/test/models/bugs_examples/vol1/kidney/kidney_test.cpp
	src/test/models/bugs_examples/vol1/leuk/leuk_test.cpp
	src/test/models/bugs_examples/vol1/leukfr/leukfr_test.cpp
	src/test/models/bugs_examples/vol1/lsat/lsat_test.cpp
	src/test/models/bugs_examples/vol1/magnesium/magnesium_test.cpp
	src/test/models/bugs_examples/vol1/mice/mice_test.cpp
	src/test/models/bugs_examples/vol1/oxford/oxford_test.cpp
	src/test/models/bugs_examples/vol1/pump/pump_test.cpp
	src/test/models/bugs_examples/vol1/rats/rats_test.cpp
	src/test/models/bugs_examples/vol1/salm/salm2_test.cpp
	src/test/models/bugs_examples/vol1/salm/salm_test.cpp
	src/test/models/bugs_examples/vol1/seeds/seeds_test.cpp
	src/test/models/bugs_examples/vol1/stacks/stacks_a_normal_test.cpp
	src/test/models/bugs_examples/vol1/stacks/stacks_b_dexp_test.cpp
	src/test/models/bugs_examples/vol1/stacks/stacks_c_t4_test.cpp
	src/test/models/bugs_examples/vol1/stacks/stacks_d_normal_ridge_test.cpp
	src/test/models/bugs_examples/vol1/stacks/stacks_e_dexp_ridge_test.cpp
	src/test/models/bugs_examples/vol1/stacks/stacks_f_t4_ridge_test.cpp
	src/test/models/bugs_examples/vol1/surgical/surgical_simple_test.cpp
	src/test/models/bugs_examples/vol1/surgical/surgical_test.cpp
	src/test/models/bugs_examples/vol2/air/air_test.cpp
	src/test/models/bugs_examples/vol2/alli/alli2_test.cpp
	src/test/models/bugs_examples/vol2/beetles/beetles_cloglog_test.cpp
	src/test/models/bugs_examples/vol2/beetles/beetles_logit_test.cpp
	src/test/models/bugs_examples/vol2/beetles/beetles_probit_test.cpp
	src/test/models/bugs_examples/vol2/birats/birats_test.cpp
	src/test/models/bugs_examples/vol2/cervix/cervix2_test.cpp
	src/test/models/bugs_examples/vol2/dugongs/dugongs_test.cpp
	src/test/models/bugs_examples/vol2/endo/endo1_test.cpp
	src/test/models/bugs_examples/vol2/endo/endo2_test.cpp
	src/test/models/bugs_examples/vol2/endo/endo3_test.cpp
	src/test/models/bugs_examples/vol2/eyes/eyes_test.cpp
	src/test/models/bugs_examples/vol2/hearts/hearts_test.cpp
	src/test/models/bugs_examples/vol2/ice/ice_test.cpp
	src/test/models/bugs_examples/vol2/jaws/jaws_test.cpp
	src/test/models/bugs_examples/vol2/mvn_orange/mvn_orange_test.cpp
	src/test/models/bugs_examples/vol2/orange/orange_test.cpp
	src/test/models/bugs_examples/vol2/t_df/estdof_test.cpp
	src/test/models/bugs_examples/vol2/t_df/simt4_test.cpp
	src/test/models/bugs_examples/vol3/camel/camel2_test.cpp
	src/test/models/bugs_examples/vol3/camel/camel_test.cpp
	src/test/models/bugs_examples/vol3/data_cloning/seeds_test.cpp
	src/test/models/bugs_examples/vol3/funshapes/circle_test.cpp
	src/test/models/bugs_examples/vol3/funshapes/parallelagram_test.cpp
	src/test/models/bugs_examples/vol3/hepatitis/hepatitisME_test.cpp
	src/test/models/bugs_examples/vol3/hepatitis/hepatitis_test.cpp
	src/test/models/command_test.cpp
	src/test/models/misc/eight_schools/eight_schools_test.cpp
	src/test/models/model_test_fixture.hpp
	src/test/models/transforms/bounded_double_test.cpp
	src/test/models/transforms/correlation_matrix_test.cpp
	src/test/models/transforms/simplex_test.cpp
	src/test/prob/distributions/univariate/continuous/exponential_test.cpp
	src/test/prob/distributions/univariate/discrete/beta_binomial_test.cpp
	src/test/prob/distributions/univariate/discrete/binomial_test.cpp