tyleryandt18

Results 1 issues of tyleryandt18

This PR should include the commit history from SavoireFaire Linux. I cloned the Unified-Diary-Screen branch, pulled the savoire Dev branch, manually resolved the merge conflicts, and then lastly pulled my...