Test pull request

added a bunch of commits and a branch which I later removed after merging it onto the master.