fdsdsa
config
sasa
MAGIE
config update
merge
Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

Conflicts:
	.classpath
uncomment password change
configs
Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

Conflicts:

	src/main/java/main/java/ca/etsmtl/gti619/lab5/spring/web/controller/MainController.java
	src/main/webapp/WEB-INF/pages/admin.jsp
change configpwList
Merge branch 'master' of https://github.com/Oreoz/GTI619-Final

Conflicts:
	src/main/webapp/WEB-INF/pages/admin.jsp
config update
Merge branch 'master' of https://github.com/Oreoz/GTI619-Final
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/main/java/ca/etsmtl/gti619/lab5/spring/web/controller/MainController.java