Inital commit
Julian can't use github, fixed merge conflict