Conflicts Resolved 4 - Student.php
deleted unnecessary bundles
commit
Merge pull request #25 from AlectaInfo/bhagya1

commit
chathus site added as twigs and paths set
merged with master
finished resource admin