Commit class 7

class 7
Commit class 7

Commit class 7
Commit class 7 - 2

...
Merge branch 'master' of https://github.com/eliasgonzalezugalde/progra_1_2014_Elias_Gonzalez

Conflicts:
	code/class_5/practicaSwitch/src/practicaswitch/eje7.java
	code/extra/Game/build/classes/game/Game$1.class
	code/extra/Game/build/classes/game/Game.class