Merge branch 'master' into Dustin
Fuck
Revert 1565eaa..1678e99

This rolls back to commit 1565eaacefbc908e8aeb6b76d6cc68eb70bf8a69.
encoding text for notes
Merge branch 'Dustin'