Created Manager Classs
updated manager.jsp
Stuff
updated manager.jsp
Stock works for branches
Request Stock Works
Final Stock
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	out/artifacts/tea2me0_war_exploded/WEB-INF/classes/models/User.class
	out/artifacts/tea2me0_war_exploded/WEB-INF/classes/servlets/Login.class
	out/artifacts/tea2me0_war_exploded/WEB-INF/classes/stores/LoggedIn.class
	src/main/java/servlets/Login.java
	src/main/java/stores/LoggedIn.java
	target/classes/models/User.class
	target/classes/servlets/Login.class
	target/classes/stores/LoggedIn.class
	web/WEB-INF/manager.jsp