layout w. bootstrap, navbar new&search icon, haml and using fa icon
E Filing | Campus Events Index Page
delete article
Delete Article
Merge remote-tracking branch 'upstream/master' into development

Conflicts:
	config/locales/en.yml
Delete Article
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	config/locales/en.yml
	db/schema.rb
Updating Column Created By
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/locales/en.yml
	db/schema.rb
E Filing | Campus Events Index Page
manual merge
manual merge rhakim
merge
remove duplicate gem
Merge branch 'master' into development

Pull Merge from master
Fix Broken Ransack
Sync Update
test
updates
manual merge