Image Uploading

Finally working
User Profile edited and added

UI can now work on it
Merge branch 'User-Profile-Carrierwave' - First Push w/o Conflicts

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/edit.html.haml
	app/views/users/show.html.haml
Second Push
Merge branch 'master' of https://github.com/CS169-badjr/calapps

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/edit.html.haml
	app/views/users/show.html.haml
Working on merging
Working on merging