Getting jasmine set up
Merge branch 'master' of github.com:kellyjosephprice/uncle_worm

Conflicts:
	Gemfile
	Gemfile.lock
	spec/javascripts/support/jasmine.yml