fdsfsd
asdffdsf
ads
Revert "trying"

This reverts commit 4f0dd46da54ab13e96d5ec4b299d24c3759215b6.
Revert "another bug fix"

This reverts commit bf1fe288ae4bea16920290e9f1887850df3d09e8.
assdf
Reverted all morning commits
Merge remote-tracking branch 'origin/master'