added enroll entity
Merge branch 'master' of https://github.com/abhirakshit/Nirvana
added enroll info
fixed conflicts