layout w. bootstrap, navbar new&search icon, haml and using fa icon
E Filing | Campus Events Index Page
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
student resident fixes
manual merge
manual merge rhakim
merge
remove duplicate gem
Merge branch 'master' into development

Pull Merge from master
remove sql file
updates
manual merge
Merge branch 'rayguard-development' into development

Merge
remove some origs
annotate
Merge branch 'master' into development

Master Merge