updated keynote slides
I apparently changed a slide in class
week2 materials
Merge branch 'master' of github.com:UWE-Ruby/RailsSpring2014
the pdf version
week 3 slides
add the homework and pdf verison of slides, still need questions
fixed conflicts
week 3 merged
week 4 materials
adding the pdf for week 4
pulled upstream master