added carrierwave gem
added carrierwave gem, not sure if it will work yet
carrierwave gem works
facebook auth progress with using devise instead of koala
facebook login works, breaks everything right after the callback
able to log in, but database fails
fixed user login, works perfectly now
removed old controller from version control
resolved conflicts