Merge branch 'master' of https://github.com/justhazzard/Semester-2-FriendIndeed

Conflicts:
	FranTest/franReadme.md

Signed-off-by: MarkDeane <markjdeane@gmail.com>