just trying to merge this sometimes git is hard yo
concluding merge
.gitignore is now working?
first working version
cleanup up some unused config files