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

Changes
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
Update 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
manual merge
Merge pull request #9 from raqibhakim/master

Update E Filing | Campus Events Index Page
merges and fixes
Merge branch 'development' of https://github.com/maxcobmara/ogma into development

Manual Pull Merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	config/locales/en.yml
	db/schema.rb
Updating Column Created By