Revert "test"
Revert "test"

This reverts commit a7f822c45232b88f5dc41a3187694eb831610e15.

# Conflicts:
#	application/views/zzz - Copy.php

project-store-student/store,project-store-student/store,project-store-student/store