stuff
Merge branch 'master' of github.com:mndeguzman/BBEF

Conflicts:
	app/admin/students.rb
upload student working
Merge branch 'master' of github.com:mndeguzman/BBEF