Added my Diary as Diary-Nikhil.txt
Updated diary
what is this broken commit
First Commit!
Edited Nicholas' diary file lol
Merging the text file from branch Nikhil
Removed the merged file.
idk what this is
Added a starting base for GUI design
Updated Diary
Merge branch 'master' into nikhil