anoying stuff out
Merge remote-tracking branch 'origin'
probably this should be in gitignore
lock
Merge branch 'new_start'
Merge branch 'master' into new_start