push
Merge branch 'master' of https://github.com/CS56-Group2/Launcher.git

Conflicts:
	LuncherMasa/Luncher.java