commit before switching to development
deleted existing copy due to unwanted changes
merge conflicts fixed on fresh copy
figuring out stances
Merging old stances branch with maz's new one he insisted on making. *eyeroll*
fixed merge conflicts
Stances are working
merged with stances
merged