Added paperclip dependencies
Added avatar column for users
added description/about us to index.html.erb
working on paperclip
working on pc
it worksgit add .
Merge pull request #12 from Babakadam121/james_merge_erwin_request

James merge erwin request
merged ruchi's paperclip resolved merge conflicts
Merge pull request #13 from Babakadam121/james_merge_ruchi_paperclip

James merge ruchi paperclip
james_restrict_new_shift_to_future
Merge pull request #14 from Babakadam121/james_restrict_new_shift_to_future

james_restrict_new_shift_to_future
added reports
Merge pull request #15 from Babakadam121/james_restrict_new_shift_to_future

added reports
Update README.md
Fixed merge conflict.