Added my Diary as Diary-Nikhil.txt
Updated diary
what is this broken commit
First Commit!
Edited Nicholas' diary file lol
Testing a commit before merging to master
Merging the text file from branch Nikhil
Removed the merged file.
Merge branch 'nicholas' of git://github.com/nklsrh/COMP2911Project into nikhil
idk what this is
Created folders for UI Interaction files
Added a starting base for GUI design
Updated Diary
Merge branch 'master' into nikhil
Removed extra file
Added a Settings/Options GUI layout
---------------------------------------- Commit Message ----------------------------------------

- Redesigning the

------------------------------------------ Stuff To Do -----------------------------------------------

- Write Ryan's Diary
- Write Class Files
- Draw UML
- Implement MVC Design/Interfaces/Packages
Merge remote-tracking branch 'origin/ryan'
Moved my Diary to Diary folder
Merge branch 'nicholas'