fighting git
Merged Daniel and Michele's