layout w. bootstrap, navbar new&search icon, haml and using fa icon
Changes
Merge pull request #5 from rayguard/development

Changes
update file registry
Update E Filing | Campus Events Index Page
E Filing | Campus Events Index Page
Merge branch 'master' of https://github.com/maxcobmara/ogma into development

Pull Merge
manual reset
Merge branch 'master' into development

Manual Merge
Update E Filing | Campus Events Index Page
deleted articles
deleted article
Update E Filing | Campus Events Index Page
delete
file registry/delete article
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/locales/en.yml
Update file registry
Update file registry
Delete Article
manual merge