Random text
Merge origin/master
Games
halp
Merge origin/master

Conflicts:
	src/jframeexamen/JFrameExamen.java