Commit
Just Commit

Conflicts:
	app/views/cofiles/show.html.haml
fix broken rake task
fix broken rake
Merge pull request #25 from raqibhakim/master

Dead Link Remove using bogus class
update staff show layout
update staff show with layout
Merge branch 'development' of https://github.com/maxcobmara/ogma into development

Pull Merge
Update New
fix top border
staff edit page started
route old to 3000
merge master
Merge remote-tracking branch 'upstream/development'
Change Layout Show for Bulletin
Done Edit,New,Form File
Merge pull request #26 from rayguard/master

Update New Update and Form file
Update and Delete Works
Merge With Upsream Development
Merge pull request #27 from rayguard/master

Repair Update and Delete Function