Doosie Update

What is she?
Merge branch 'master' of https://github.com/dearbis1/Semester-2-FriendIndeed

Conflicts:
	bishnu_pokhrel-friendindeed-555062dc6d1f/bishnu_pokhrel-friendindeed-555062dc6d1f/FriendIndeed/another fucking test.txt