Added Javascript and Ruby Testing assignment
Merge branch 'master' of github.com:tibbon/WDI_Summer_Public
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assignments/.DS_Store
	examples/ajax_rails/app/assets/javascripts/application.js