Adds rspec
Small fix
Merge branch 'master' into adamov/move-to-rspec

Conflicts:
	website/Gemfile
Moves fixtures
Use id instead of instance in spec
Merge pull request #53 from obshtestvo/adamov/move-to-rspec

Adamov: Move to rspec