ADDED database_cleaner.rb
UPDATED user spec
ADDED rspec for apprenticeship and rating models
ADDED apprenticeship_spec, rating_spec and role_spec .rb files
UPDATED apprenticship and rating spec
ADDED site index, controller, semantic-ui stylesheets and javascripts
Merge pull request #6 from Simon245/apprenticeship_tests

spec tests
Partially rewrote user_spec.rb
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
Added new fields to database and ran migration
Merge branch 'master' of https://github.com/josephktcheung/grasshopper

Conflicts:
	Gemfile.lock
REMOVED god damn libv8
Added Gemfile.lock to .git ignore
ADDED additional user specs
Merge pull request #9 from annieccheung/master

Temporarily ignore gemfile.lock
ADDED users_controller and scope api to routes
FIXED userspecs