small note in main
Merge branch 'TroyBranch'
Merge branch 'master' of github.com:ajthompson/cs2303-prog5 into alec
Fixed git conflict flags
Merge branch 'alec'