Add tinycme-rails gem
Add tinymce yaml file, with tool bar and plugin options for text editor
Add tinycme to status partial, assets, and ablilty to use text editor to add posts
Add htm_safe to statuses partials and the profile index
Add paperclip avatar column to database using rails generate paperclip user avatar. Add avatar symbol attribute to application controller. Add :avatar into new registration and edit registration.
Add avatar to users index, add upload specs to user.rb, Add pic upload to new and edit registrations
Gemlock changed
Merging add-messaging branch to master
Merge pull request #8 from avijohnson/master

Correct versions with text box from add-messaging to merge to master