Commit after merge for user testing
completed strikethrough, dispute btn, mouse hover
Merge branch 'master' of github.com:Gowiem/Sisyphus into craig-faculty
Merging faculty changes