index.php is removed from git
huntertyson changes
huntertyson changes
Merge remote-tracking branch 'origin/huntertyson_changes' into huntertyson_changes
skin theme name is changed to em0060_huntertyson from em0060_green
removed body background image
popular product h2 background added
manufacturer video functionality
manufacturer video functionality
Merge remote-tracking branch 'origin/huntertyson_changes' into huntertyson_changes

Conflicts:
	app/design/frontend/default/em0060/template/catalog/product/video_view.phtml
hundertyson video changes
hundertyson video changes
Merge remote-tracking branch 'origin/huntertyson_changes' into huntertyson_changes

Conflicts:
	app/code/local/Submergecamera/CategoryAdvanced/Block/Video.php
	app/code/local/Submergecamera/CategoryAdvanced/Helper/Data.php
	app/code/local/Submergecamera/CategoryAdvanced/etc/config.xml
	app/design/frontend/default/em0060/template/catalog/product/video_view.phtml
video sidebar changes
video sidebar changes
Merge remote-tracking branch 'origin/huntertyson_changes' into huntertyson_changes

Conflicts:
	app/code/local/Submergecamera/CategoryAdvanced/Block/Video.php
	app/design/frontend/default/em0060/template/catalog/product/video_sidebar.phtml
warranty info condition added
style changes in manufacture view page
Css modification.
common.js added