First commit of CS169.2 HW1.1
Merge working (without comments)
Cucumber passing green
Some specs failing