woah first commit doe
oops, put stuff on master