made a browseVideos page
rename BrowseVideoController to VideoInfoController
Merge pull request #18 from caleb-chan/master

Testing Update and View Video Update
add dynamic sections to browseVideos.jsp
Merge pull request #21 from caleb-chan/master

Adding Sam's new code + some test classes
Merge remote-tracking branch 'origin/master' into mark-master

Conflicts:
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
	VSS-web/src/main/webapp/index.jsp
Merge pull request #24 from caleb-chan/master

Added new test classes and minor fixes for test code
Merge remote-tracking branch 'origin/master' into mark-master
send banner search term as URL parameter
Revert "rename BrowseVideoController to VideoInfoController"

This reverts commit 7fde7171ebd2491778b6c3f7e656c94208fa9bc5.

Conflicts:
	VSS-web/src/main/java/com/team33/controllers/BrowseVideosController.java
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
	VSS-web/src/main/webapp/WEB-INF/views/browseVideos.jsp
Merge pull request #26 from caleb-chan/master

Merged Sam's branch and compile error fixes (Feb 13, 2013 6:27 PM)
Merge pull request #30 from caleb-chan/master

Webpage changes and Test code updates
Merge pull request #32 from caleb-chan/master

New test cases and test stubs
cleaning up browseVideos
Merge remote-tracking branch 'origin/master' into mark-master

Conflicts:
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
	VSS-web/src/main/webapp/WEB-INF/jspf/banner.jspf
Merge pull request #33 from caleb-chan/master

Shopping cart update
add name to input field so that it appears as URL parameter
Merge remote-tracking branch 'origin/master' into mark-master

Conflicts:
	VSS-web/src/main/webapp/WEB-INF/dispatcher-servlet.xml
change browse link in banner to point to correct broswe page
Merge pull request #24 from caleb-chan/trial_merge_branch

Transaction merge update