started with stuff
Merge branch 'master' of github.com:Connor93/nick-testbed