Git Ignore
Alterada Senha
Controller e models
Merge branch 'master' of https://github.com/rafaelbrunoti/javap1

Conflicts:
	src/model/beans/GameBean.java
	src/model/beans/MidiaBean.java
	src/model/beans/PlataformaBean.java
Merge branch 'master' of https://github.com/rafaelbrunoti/javap1