not sure what's going on here, but committing anyway because I fixing git disasters.
Merge branch 'master' of github.com:stelligent/SWFpoc