fixing break line in prodi bidang
Merge branches 'master' and 'surveyalumni'

Conflicts:
	app/views/univs/show.html.erb
fixing
Merge branches 'master' and 'surveyalumni'
Merge branch 'master' of https://github.com/glendkampuskoit/kampuskoit