cleaned up root project directory
master out of sorts
uh, not doing much in this commit
weirdness
merge fix