Initial commit
Switch from SVN repo
Resolved merge conflicts