random diffs related to still being new to rails as well as additions to the public folder