Added on file from the merge that wasn't saved
Added on file from the merge that wasn't saved

MattiasLiljeson/Amalgamation,MattiasLiljeson/Amalgamation,MattiasLiljeson/Amalgamation,MattiasLiljeson/Amalgamation