initial project commit, hopefully everything works
merging