commit degree,bv29,bv21
commit menu bv21,29
Merge branch 'master' of https://github.com/iYottt/graduate

Conflicts:
	application/config/database.php