air
Merge branch 'master' of https://github.com/koke6645/SE452

Conflicts:
	.gitignore
	HSQLDB/db/mydb.log
	HSQLDB/db/mydb.properties
	HSQLDB/db/mydb.script
	MyOnlineStore/nb-configuration.xml
	MyOnlineStore/pom.xml
	MyOnlineStore/src/main/webapp/META-INF/context.xml
	MyOnlineStore/src/main/webapp/index.jsp