ADDED semantic-ui-rails gem and associated js and css files.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper
ADDED site route, controller, index.html (and REMOVED semantic-ui gem)
ADDED skill_spec and skills_users_spec.
ADDED users_controller_spec.rb
Merge branch 'skills_spec' of github.com:annieccheung/grasshopper into annieccheung-skills_spec

Conflicts:
	RESOLVED Gemfile.lock
Merge branch 'master' of github.com:josephktcheung/grasshopper
Merge pull request #8 from Simon245/users_controller_test

ADDED users_controller_spec.rb
Merge remote-tracking branch 'origin/master' into conversation_test_cases
REMOVED god damn libv8