Merge pull request #30 from TIYA-Durham-GDI/erb-fix

Erb fix
Keep fixing weird div situation
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into erb-fix