worked on stuff
Merge branch 'master' of github.com:sharpmachine/onthebeam.com