added balanced gem and created balanced.rb initializer
made some changes to user/show view to bring show the post gear button. all views need to be fixed.
fixed user name. It was previously not being saved. Unpermitted parameters: name rails. Also has code for rentals for payment system
adjusted the sign in page to show more of the page. used <div class = jumbotron>
cleaned up application helper, had some merge issues. same logic but cleaned up comments.
implemented cancel account (destroy methond in user controller, button to cancel account, pop up message to confirm, email to user that account has been cancelled) and implemented user can create account (email confirmation when signing up)
Implemented upload profile picture using paperclip
stashing changes before merge with stg 5/14
merge conflict with staging 4/15/14 12:12am
merge show.html.erb conflict
fixed alignment on postgear, sign up and sign in views