big changes apparently; working on setting up authentication with rails devise
merge conflict