Added features for user skills feature
working on javascript testing for modal window
Implemented some of the feature steps
more work on hire-me button
march4th-hire_me cukes WIP
ping to thomas for comments
Added Bootstrap tags library
Added skills to users#show
more changes
pong to jon: hire_me button rspec and cukes failing
Skills implemented
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into user_skills

Conflicts:
	app/views/devise/registrations/edit.html.erb
	app/views/users/show.html.erb
Missing div tag
User skills on profile feature passing
Removed users index skills feature as not required
ping to thomas.Sat8th 500 error on cuke
merge with upstream and resolved some conflicts in users/show
added test to mailer_spec
made changes in controller to pass in @user to the mailer method. Added mailer_spec and controller_spec for the hire_me_form and method
Tag Cloud Feature Created