Tuesday morning trying to get updated on TantiveIV
Merge branch 'master' of https://github.com/locktide/saas_cs3300_hw
again just trying to fix...
Conflicts:
	hw3/rottenpotatoes/log/development.log
Final rap up tuesday morning!!!