add master branch as submodule
move dev stuff to root
update master