on laptop trying to get finish HW2 product pulled down
Merge branch 'master' of https://github.com/locktide/saas_cs3300_hw
again trying to fix on laptop...

Conflicts:
	hw2/public/spec/oracle_of_bacon_spec.rb~
Adding Hw3 skeletoon code to repo