want to try a new gem for bootstrap... so far fixed some views
fixed some views
merged conflicts
Merge pull request #17 from deliaz1993/master

views fixed up some more!