clutter fixed
transitions added
merging
merging
merging
Attempting to fix merge issues
Merge branch 'JacobsBranch' of https://github.com/tashage/sonshine into JacobsBranch
Merge branch 'JacobsBranch'
Attempting to fix merge issues
Attempting to fix merge issues again
Attempting to fix merge issues again
Attempting to fix merge issues again