Changed to row-fluid for views
Merged conficts
Worked on forms and added the better_errors gem
Merged