added in image uploader
Merge branch 'master' of https://github.com/willmitchill/helpout into boss

Conflicts:
	app/actions.rb
	app/views/index.erb
	app/views/profile/user_profile.erb
	app/views/projects.erb
fixed conflicts
new master