uiyf
Merge branch 'master' of https://github.com/destroyerdust/SWEN-343-Group6-CoolName

Conflicts:
	src/main/java/com/thumbsup/coolnamecli/Shell.java