made a change
master changes
fixed broken stuff
master merged with testing branch