debugging haha I'm so sorry
Merge branch 'master' of github.com:vidcode/VidCode