not sure but doesn't suck
Merge branch 'master' of github.com:bennlich/gobagamegamdu
starting editor, fixed input
fixed conflict