Initial commit
Removed unused controller
Removed unused helpers
Divided conversations into inbox, sentbox and trash.
Changed conversations#destroy to trash.
Added conversations#untrash.
Cleaned the routes
Fixed: inverted condition for trash/untrash conversation links
second commit
Getting josh's custom bootstrap into the rails app
actionmailer implemeted through the deals now to implement users scaffold and put the action mailer to work there
created users and fixed new user email confirmation
devise
Revert "devise"

This reverts commit 937b4eb31128a1130ca72c9b0a7824881582ca72.
Revert "created users and fixed new user email confirmation"

This reverts commit 18019796dbac5e12177e4e1f1c1eccf90bbce684.
Fixed Sign out issues. Made sure complete user session is available now via our application layout view
made a show page for users, added colleges and name to attr_access of user model
added .edu requirement to email signup, reduced password length min to 4
fixed user routes so it's possible to view individual user pages
fixed ruby instance of user to 'current_user'
moved images to assets pipeline instead of public and rewrote HTML image  tags on the application layout to ruby
replaced logo html to ruby on application view layout
getting modal to pop up for sign up and putting ruby code into the HTML sign up overlay - but that doesn't work yet