server commit
Merge branch 'active_record' of github.com:snlkumar/timenow into active_record
change in asets
"remove geocoder"
Merge branch 'active_record' of github.com:snlkumar/timenow into active_record
"fix the production issue"
Merge branch 'active_record' of github.com:snlkumar/timenow into active_record
dfdf
"change active record"
Merge branch 'active_record' of github.com:snlkumar/timenow into active_record
change in assets
"sdsd"
Merge branch 'active_record' of github.com:snlkumar/timenow into active_record
"change in oice"
Merge branch 'active_record' of github.com:snlkumar/timenow into active_record
server commit
remove asets
remove conflict
gghghhg
fix the production email