moved rspec out of :development
Merge branch 'master' of https://github.com/DarrenTsung/warmup_project

Conflicts:
	Gemfile