resolved
Merge branch 'development' of https://github.com/theponti/Hello into development
Merge branch 'development' of https://github.com/theponti/Hello into development
Merge branch 'development' of https://github.com/theponti/Hello into development

aborts
implemented carrierwave and rmagic
fixed conflict in reg/new.html.haml
non-changes in user.rb
fix merge conflict in user.rb
logout nav
updated associations
user table updates, sign-up flow updates
login/logout
messaging foundations
I don't always commit to Git, but when I do, there's shit tons of conflicts
profile views, profile updates and account updates - ish
Merge branch 'development' of https://github.com/theponti/Hello into development
Resolved conflict in user model
Merge branch 'development' of https://github.com/theponti/Hello into development
commiting stuff pulled
Updated user model and search controller