master_development

Created by: zeffii

this is where we fix master if it's broken. merge your fix attempts into this. then when it works for everyone, we can merge this into master.