rspec installed
Merge branch 'master' of https://github.com/piratetone/krossover-v2

Conflicts:
	Gemfile.lock
	config/environments/development.rb
Merge branch 'master' of https://github.com/piratetone/krossover-v2
Merge branch 'master' of https://github.com/piratetone/krossover-v2
admin dashboard
Merge pull request #13 from piratetone/rails_admin

Rails admin